turbo-native-initializer 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6134975dfb64645d0fe32a2dfcaa61efe0719458540d0e294cffc5547646397
-  data.tar.gz: df7dada5dc6d57ff85e58e2439c86a9e06cc0e4e89fe8a5547509da483493906
+  metadata.gz: d5b3658efa201b5340d0e5ecdc401395f6659c235a5177c1e7a6b908b69a2f09
+  data.tar.gz: 7327665391ec9be569354ad811f9565a6164da08aea90c3e8bfe04f65e03cf5a
 SHA512:
-  metadata.gz: 2135c55c9a059bba1907bd90f776e352968d74af49cdc8173d8b6f1d92ecbf5b09e566d3626e02d5842a509fb1dea7b3d7dde0d847046da4cb9740186f5e04b4
-  data.tar.gz: 4c648e53161c6ab00f22787b3dc059cf06d8f259a9eabdd8aad0617e33d56ccac29ca6556f4eaa31fd8eb93fbbf50ad15d2d18e5b9f5fe3d1875369679bae5bc
+  metadata.gz: 1dcedc375f6de7437ff80b816424e599b7b266713c94417a6752bf16104e8ac719f0cbbed03b500efe891a3590f84c000a16f254d25e8fac5c6546883a4b8a30
+  data.tar.gz: b5e35c0791bf2a6b3fdc6eeaec4c45b5b14388b796c9d51f3539d2547fd93f106c01d483ec6a90d7cb6d73359cdfb2d76501226dab9fd070535f082922c6ef1c

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

@@ -25,7 +25,6 @@ open class WebFragment : TurboWebFragment(), NavDestination {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupMenu()
         viewLifecycleOwner.lifecycle.addObserver(bridgeDelegate)
     }
 
@@ -60,8 +59,4 @@ open class WebFragment : TurboWebFragment(), NavDestination {
     override fun createErrorView(statusCode: Int): View {
         return layoutInflater.inflate(R.layout.error_web, null)
     }
-
-    private fun setupMenu() {
-        toolbarForNavigation()?.inflateMenu(R.menu.web)
-    }
 }

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

@@ -1,6 +1,9 @@
 package <%= package_name %>.strada
 
 import android.util.Log
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import dev.hotwire.strada.BridgeComponent
@@ -8,6 +11,7 @@ import dev.hotwire.strada.BridgeDelegate
 import dev.hotwire.strada.Message
 import <%= package_name %>.R
 import <%= package_name %>.base.NavDestination
+import <%= package_name %>.databinding.NavButtonComponentBinding
 import kotlinx.serialization.Serializable
 
 class NavButtonComponent(
@@ -15,6 +19,8 @@ class NavButtonComponent(
     private val delegate: BridgeDelegate<NavDestination>
 ) : BridgeComponent<NavDestination>(name, delegate) {
 
+    private val navButtonItemId = 10
+    private var navButtonMenuItem: MenuItem? = null
     private val fragment: Fragment
         get() = delegate.destination.fragment
     private val toolbar: Toolbar?
@@ -34,26 +40,27 @@ class NavButtonComponent(
     }
 
     private fun showToolbarButton(data: MessageData) {
-        val toolbar = toolbar ?: return
+        val menu = toolbar?.menu ?: return
+        val inflater = LayoutInflater.from(fragment.requireContext())
+        val binding = NavButtonComponentBinding.inflate(inflater)
+        val order = 999 // Show as the right-most button
 
-        toolbar.menu.findItem(R.id.nav_button)?.apply {
-            isVisible = true
-            title = data.title
+        binding.navButton.apply {
+            text = data.title
+            setOnClickListener {
+                performAction()
+            }
         }
 
-        toolbar.setOnMenuItemClickListener {
-            when (it.itemId) {
-                R.id.nav_button -> {
-                    performClick()
-                    true
-                }
-                else -> false
-            }
+        menu.removeItem(navButtonItemId)
+        navButtonMenuItem = menu.add(Menu.NONE, navButtonItemId, order, data.title).apply {
+            actionView = binding.root
+            setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
         }
     }
 
-    private fun performClick() {
-        replyTo("connect")
+    private fun performAction(): Boolean {
+        return replyTo("connect")
     }
 
     @Serializable

data/lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/layout/nav_button_component.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="end|center_vertical"
+    android:paddingEnd="16dp">
+
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Material3.Button.TextButton"
+        android:id="@+id/nav_button"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:minWidth="0dip" />
+</FrameLayout>

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

@@ -22,7 +22,6 @@ open class WebFragment : TurboWebFragment(), NavDestination {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupMenu()
         viewLifecycleOwner.lifecycle.addObserver(bridgeDelegate)
     }
 
@@ -50,8 +49,4 @@ open class WebFragment : TurboWebFragment(), NavDestination {
     override fun createErrorView(statusCode: Int): View {
         return layoutInflater.inflate(R.layout.error_web, null)
     }
-
-    private fun setupMenu() {
-        toolbarForNavigation()?.inflateMenu(R.menu.web)
-    }
 }

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

@@ -1,6 +1,9 @@
 package <%= package_name %>.strada
 
 import android.util.Log
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import dev.hotwire.strada.BridgeComponent
@@ -8,6 +11,7 @@ import dev.hotwire.strada.BridgeDelegate
 import dev.hotwire.strada.Message
 import <%= package_name %>.R
 import <%= package_name %>.base.NavDestination
+import <%= package_name %>.databinding.NavButtonComponentBinding
 import kotlinx.serialization.Serializable
 
 class NavButtonComponent(
@@ -15,6 +19,8 @@ class NavButtonComponent(
     private val delegate: BridgeDelegate<NavDestination>
 ) : BridgeComponent<NavDestination>(name, delegate) {
 
+    private val navButtonItemId = 10
+    private var navButtonMenuItem: MenuItem? = null
     private val fragment: Fragment
         get() = delegate.destination.fragment
     private val toolbar: Toolbar?
@@ -34,26 +40,27 @@ class NavButtonComponent(
     }
 
     private fun showToolbarButton(data: MessageData) {
-        val toolbar = toolbar ?: return
+        val menu = toolbar?.menu ?: return
+        val inflater = LayoutInflater.from(fragment.requireContext())
+        val binding = NavButtonComponentBinding.inflate(inflater)
+        val order = 999 // Show as the right-most button
 
-        toolbar.menu.findItem(R.id.nav_button)?.apply {
-            isVisible = true
-            title = data.title
+        binding.navButton.apply {
+            text = data.title
+            setOnClickListener {
+                performAction()
+            }
         }
 
-        toolbar.setOnMenuItemClickListener {
-            when (it.itemId) {
-                R.id.nav_button -> {
-                    performClick()
-                    true
-                }
-                else -> false
-            }
+        menu.removeItem(navButtonItemId)
+        navButtonMenuItem = menu.add(Menu.NONE, navButtonItemId, order, data.title).apply {
+            actionView = binding.root
+            setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
         }
     }
 
-    private fun performClick() {
-        replyTo("connect")
+    private fun performAction(): Boolean {
+        return replyTo("connect")
     }
 
     @Serializable

data/lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/layout/nav_button_component.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="end|center_vertical"
+    android:paddingEnd="16dp">
+
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Material3.Button.TextButton"
+        android:id="@+id/nav_button"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:minWidth="0dip" />
+</FrameLayout>

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

@@ -14,9 +14,7 @@ final class SceneDelegate: UIResponder {
     // MARK: - Setup
 
     private func configureRootViewController() {
-        guard let window = window else { fatalError() }
-
-        navigationController = window.rootViewController as? TurboNavigationController
+        navigationController = window!.rootViewController as? TurboNavigationController
         navigationController.session = session
         navigationController.modalSession = modalSession
     }
@@ -68,6 +66,14 @@ extension SceneDelegate: SessionDelegate {
         navigationController.route(url: proposal.url, options: proposal.options, properties: proposal.properties)
     }
 
+    func session(_ session: Session, openExternalURL url: URL) {
+        if url.host == rootURL.host, !url.pathExtension.isEmpty {
+            navigationController.present(SFSafariViewController(url: url), animated: true)
+        } else {
+            UIApplication.shared.open(url)
+        }
+    }
+
     func session(_ session: Session, didFailRequestForVisitable visitable: Visitable, error: Error) {
         if let turboError = error as? TurboError, case let .http(statusCode) = turboError, statusCode == 401 {
             promptForAuthentication()
@@ -78,58 +84,22 @@ extension SceneDelegate: SessionDelegate {
         }
     }
 
-    // When a form submission completes in the modal session, we need to
-    // manually clear the snapshot cache in the default session, since we
-    // don't want potentially stale cached snapshots to be used
     func sessionDidFinishFormSubmission(_ session: Session) {
         if (session == modalSession) {
             self.session.clearSnapshotCache()
         }
     }
 
-    func sessionDidLoadWebView(_ session: Session) {
-        session.webView.navigationDelegate = self
-    }
-
     func sessionWebViewProcessDidTerminate(_ session: Session) {
         session.reload()
     }
 }
 
-extension SceneDelegate: WKNavigationDelegate {
-    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
-        if navigationAction.navigationType == .linkActivated {
-            // Any link that's not on the same domain as the Turbo root url will go through here
-            // Other links on the domain, but that have an extension that is non-html will also go here
-            // You can decide how to handle those, by default if you're not the navigationDelegate
-            // the Session will open them in the default browser
-
-            let url = navigationAction.request.url!
-
-            // For this demo, we'll load files from our domain in a SafariViewController so you
-            // don't need to leave the app. You might expand this in your app
-            // to open all audio/video/images in a native media viewer
-            if url.host == rootURL.host, !url.pathExtension.isEmpty {
-                let safariViewController = SFSafariViewController(url: url)
-                navigationController.present(safariViewController, animated: true)
-            } else {
-                UIApplication.shared.open(url)
-            }
-
-            decisionHandler(.cancel)
-        } else {
-            decisionHandler(.allow)
-        }
-    }
-}
-
 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) })
-
-        // JavaScript alerts in Turbo Native
         navigationController.present(confirm, animated: true)
     }
 }

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

@@ -14,14 +14,8 @@ final class SceneDelegate: UIResponder {
     private let rootURL2 = <%= name %>.homeURL2
 
     private var tabBarController: UITabBarController!
-
-    private lazy var navigationController1 = {
-        tabBarController.viewControllers![0] as! TurboNavigationController
-    }()
-
-    private lazy var navigationController2 = {
-        tabBarController.viewControllers![1] as! TurboNavigationController
-    }()
+    private var navigationController1: TurboNavigationController!
+    private var navigationController2: TurboNavigationController!
 
     private func navigationController() -> TurboNavigationController {
         tabBarController.selectedViewController as! TurboNavigationController
@@ -30,13 +24,13 @@ final class SceneDelegate: UIResponder {
     // MARK: - Setup
 
     private func configureRootViewController() {
-        guard let window = window else { fatalError() }
-
-        tabBarController = window.rootViewController as? UITabBarController
+        tabBarController = window!.rootViewController as? UITabBarController
 
+        navigationController1 = tabBarController.viewControllers![0] as? TurboNavigationController
         navigationController1.session = session1
         navigationController1.modalSession = modalSession
 
+        navigationController2 = tabBarController.viewControllers![1] as? TurboNavigationController
         navigationController2.session = session2
         navigationController2.modalSession = modalSession
     }
@@ -88,6 +82,14 @@ extension SceneDelegate: SessionDelegate {
         navigationController().route(url: proposal.url, options: proposal.options, properties: proposal.properties)
     }
 
+    func session(_ session: Session, openExternalURL url: URL) {
+        if url.host == baseURL.host, !url.pathExtension.isEmpty {
+            navigationController().present(SFSafariViewController(url: url), animated: true)
+        } else {
+            UIApplication.shared.open(url)
+        }
+    }
+
     func session(_ session: Session, didFailRequestForVisitable visitable: Visitable, error: Error) {
         if let errorPresenter = visitable as? ErrorPresenter {
             errorPresenter.presentError(error) { session.reload() }
@@ -96,58 +98,22 @@ extension SceneDelegate: SessionDelegate {
         }
     }
 
-    // When a form submission completes in the modal session, we need to
-    // manually clear the snapshot cache in the default session, since we
-    // don't want potentially stale cached snapshots to be used
     func sessionDidFinishFormSubmission(_ session: Session) {
         if (session == modalSession) {
             self.session().clearSnapshotCache()
         }
     }
 
-    func sessionDidLoadWebView(_ session: Session) {
-        session.webView.navigationDelegate = self
-    }
-
     func sessionWebViewProcessDidTerminate(_ session: Session) {
         session.reload()
     }
 }
 
-extension SceneDelegate: WKNavigationDelegate {
-    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
-        if navigationAction.navigationType == .linkActivated {
-            // Any link that's not on the same domain as the Turbo root url will go through here
-            // Other links on the domain, but that have an extension that is non-html will also go here
-            // You can decide how to handle those, by default if you're not the navigationDelegate
-            // the Session will open them in the default browser
-
-            let url = navigationAction.request.url!
-
-            // For this demo, we'll load files from our domain in a SafariViewController so you
-            // don't need to leave the app. You might expand this in your app
-            // to open all audio/video/images in a native media viewer
-            if url.host == baseURL.host, !url.pathExtension.isEmpty {
-                let safariViewController = SFSafariViewController(url: url)
-                navigationController().present(safariViewController, animated: true)
-            } else {
-                UIApplication.shared.open(url)
-            }
-
-            decisionHandler(.cancel)
-        } else {
-            decisionHandler(.allow)
-        }
-    }
-}
-
 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) })
-
-        // JavaScript alerts in Turbo Native
+        confirm.addAction(UIAlertAction(title: "OK", style: .default) { _ in completionHandler(true) })        
         navigationController().present(confirm, animated: true)
     }
 }

data/lib/turbo_native_initializer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo-native-initializer
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -77,7 +77,7 @@ files:
 - lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/layout/fragment_web_home.xml
 - lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/layout/menu_component_adapter_row.xml
 - lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/layout/menu_component_bottom_sheet.xml
-- lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/menu/web.xml
+- lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/layout/nav_button_component.xml
 - lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 - lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 - lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/mipmap-xhdpi/ic_launcher.png
@@ -136,8 +136,8 @@ files:
 - lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/layout/fragment_web_home.xml
 - lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/layout/menu_component_adapter_row.xml
 - lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/layout/menu_component_bottom_sheet.xml
+- lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/layout/nav_button_component.xml
 - lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/menu/bottom_navigation_menu.xml
-- lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/menu/web.xml
 - lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 - lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 - lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/mipmap-xhdpi/ic_launcher.png

data/lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/menu/web.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/nav_button"
-        android:orderInCategory="999"
-        android:visible="false"
-        app:showAsAction="always" />
-</menu>

data/lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/menu/web.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/nav_button"
-        android:orderInCategory="999"
-        android:visible="false"
-        app:showAsAction="always" />
-</menu>