RubyGems - turbo-native-initializer - Versions diffs - 0.0.3 → 0.0.4 - Mend

turbo-native-initializer 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f651e0de673db040c8ed9f369d404b8f08946654c721329d07bfd9cbbc0149
-  data.tar.gz: ec47793c2bf2370f5cd4390bcf45a8ef14bad81ff70f0f3c4ba6cb1d3bb8c980
+  metadata.gz: 9b02a10e9fb3bdea77c7546d6a5c7ae4da7753f86232af13a88b53725a47d67f
+  data.tar.gz: 7be945f9a4ba16207cd4f69f9b5f56067d78f1a0dfc720f45a77c18b3d420b24
 SHA512:
-  metadata.gz: 40079d2dc7c716940cf72a536304801180f62c509a8d64e6bf7bcdd4cf4f5179f52b1e2213f57ac7e9fb4e1865c02a45f8ba8e123813fbff92e3f541090909a8
-  data.tar.gz: 0bebf193304c04ed0ddaa53340fb4d0c9f4d46209471f18f883a9e0df83ec8038b2a16544372d2b704d421119519552b01c0641cd0f82181615287db906724e0
+  metadata.gz: 7941d020b629c6ac4d2c754e666274758b972af5cb3c2481a777017f461571f6201e3fe9ba0bbe3b26bcc3baa96df7df6f9561f2a4e23327654eeb08e1a7e83a
+  data.tar.gz: 8a0a7ce879c65945d50209d54a19535cfcb9048ed2429f79dce9ab7a6d28acabee63dc11ce6296b095fa213f9245667e60e50d8a98690e5f54fe7e1c868108df

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,12 @@
 ## [Unreleased]
+## [0.0.4] - 2023-09-09
+- Added accent color (iOS)
+- Added basic theme colors (Android)
+- Fallback invalid "view-controller" navigations to web (iOS)
+- Fix iOS modal navigation failing when not fullscreen
 ## [0.0.3] - 2023-09-08
 - Add a Swift UI native screen

data/README.md CHANGED Viewed

@@ -5,12 +5,11 @@ A turbo native project generator for iOS and Android.
 ## Differences when compared to the demos
 - Added SwiftUI error screen. (iOS)
-- Added SwiftUI numbers screen. (iOS)
-- Added Jetpack Compose numbers screen. (Android)
-- Added UIAlertController to handle `turbo-native-confirm`. (iOS)
+- 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 full screen option to modals. (iOS/Android)
 - 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/native/NumbersFragment.kt.tt CHANGED Viewed

@@ -27,7 +27,7 @@ fun NumbersList() {
     LazyColumn {
         items(numbers.count()) { index ->
-            ListItem(headlineContent = { Text("Row number ${index + 1}") })
+            ListItem(headlineContent = { Text("Row ${index + 1}") })
             Divider()
         }
     }

data/lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/values/colors.xml CHANGED Viewed

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="color_brand">#5cd8e5</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-</resources>
+</resources>

data/lib/turbo_native_initializer/templates/android_stack/base/app/src/main/res/values/themes.xml.tt CHANGED Viewed

@@ -1,5 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.<%= name %>" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/color_brand</item>
+        <item name="colorPrimaryDark">@color/color_brand</item>
+        <item name="colorAccent">@color/color_brand</item>
     </style>
 </resources>

data/lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/native/NumbersFragment.kt.tt CHANGED Viewed

@@ -27,7 +27,7 @@ fun NumbersList() {
     LazyColumn {
         items(numbers.count()) { index ->
-            ListItem(headlineContent = { Text("Row number ${index + 1}") })
+            ListItem(headlineContent = { Text("Row ${index + 1}") })
             Divider()
         }
     }

data/lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/values/colors.xml CHANGED Viewed

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="color_brand">#5cd8e5</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-</resources>
+</resources>

data/lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/res/values/themes.xml.tt CHANGED Viewed

@@ -1,5 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.<%= name %>" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/color_brand</item>
+        <item name="colorPrimaryDark">@color/color_brand</item>
+        <item name="colorAccent">@color/color_brand</item>
     </style>
 </resources>

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

@@ -26,9 +26,9 @@ class TurboNavigationController : UINavigationController {
         let viewController = makeViewController(for: url, properties: properties)
         navigate(to: viewController, action: options.action, properties: properties)
-        // - Initiate the visit with Turbo
+        // Initiate the visit with Turbo
         if isVisitable(properties) {
-            visit(viewController: viewController, with: options)
+            visit(viewController: viewController, with: options, modal: isModal(properties))
         }
     }
 }
@@ -77,33 +77,30 @@ extension TurboNavigationController {
             case "numbers":
                 return NumbersViewController()
             default:
-                assertionFailure("Invalid view controller, defaulting to WebView")
+                return ViewController(url: url)
             }
+        } else {
+            return ViewController(url: url)
         }
-        return ViewController(url: url)
     }
-    private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:], animated: Bool = true) {
-        let modalNavController = UINavigationController(rootViewController: viewController)
-        modalNavController.modalPresentationStyle = .fullScreen
+    private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {
         if isModal(properties) {
-            present(modalNavController, animated: animated)
-        } else if isClearAll(properties) {
-            popToRootViewController(animated: true)
+            present(UINavigationController(rootViewController: viewController), animated: true)
         } else if isPop(properties) {
             popViewController(animated: true)
         } else if isRefresh(properties) {
             session.reload()
         } else if isNone(properties) {
             // Will result in no navigation action being taken
+        } else if isClearAll(properties) {
+            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 {
-            pushViewController(viewController, animated: animated)
+            pushViewController(viewController, animated: true)
         }
     }

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

@@ -10,7 +10,7 @@ final class ViewController: VisitableViewController, ErrorPresenter {
         navigationItem.backButtonDisplayMode = .minimal
         if presentingViewController != nil {
-            navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(dismissModal))
+            navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(dismissModal))
         }
     }

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

@@ -15,8 +15,6 @@ final class SceneDelegate: UIResponder {
     private func configureRootViewController() {
         guard let window = window else { fatalError() }
-        window.tintColor = UIColor(named: "Tint")
         navigationController = window.rootViewController as? TurboNavigationController
         navigationController.session = session
         navigationController.modalSession = modalSession

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Assets.xcassets/AccentColor.colorset/Contents.json CHANGED Viewed

@@ -1,6 +1,33 @@
 {
   "colors" : [
     {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.898",
+          "green" : "0.847",
+          "red" : "0.361"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.898",
+          "green" : "0.847",
+          "red" : "0.361"
+        }
+      },
       "idiom" : "universal"
     }
   ],

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Base.lproj/Main.storyboard.tt CHANGED Viewed

@@ -3,30 +3,15 @@
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Turbo Navigation Controller-->
         <scene sceneID="s0d-6b-0kx">
             <objects>
-                <viewController id="Y6W-OH-hqX" customClass="TurboNavigationController" customModule="<%= name %>" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                    </view>
-                </viewController>
+                <viewController id="Y6W-OH-hqX" customClass="TurboNavigationController" customModule="TurboNativeProjectIos" 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>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
 </document>

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

@@ -26,9 +26,9 @@ class TurboNavigationController : UINavigationController {
         let viewController = makeViewController(for: url, properties: properties)
         navigate(to: viewController, action: options.action, properties: properties)
-        // - Initiate the visit with Turbo
+        // Initiate the visit with Turbo
         if isVisitable(properties) {
-            visit(viewController: viewController, with: options)
+            visit(viewController: viewController, with: options, modal: isModal(properties))
         }
     }
 }
@@ -77,33 +77,30 @@ extension TurboNavigationController {
             case "numbers":
                 return NumbersViewController()
             default:
-                assertionFailure("Invalid view controller, defaulting to WebView")
+                return ViewController(url: url)
             }
+        } else {
+            return ViewController(url: url)
         }
-        return ViewController(url: url)
     }
-    private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:], animated: Bool = true) {
-        let modalNavController = UINavigationController(rootViewController: viewController)
-        modalNavController.modalPresentationStyle = .fullScreen
+    private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {
         if isModal(properties) {
-            present(modalNavController, animated: animated)
-        } else if isClearAll(properties) {
-            popToRootViewController(animated: true)
+            present(UINavigationController(rootViewController: viewController), animated: true)
         } else if isPop(properties) {
             popViewController(animated: true)
         } else if isRefresh(properties) {
             session.reload()
         } else if isNone(properties) {
             // Will result in no navigation action being taken
+        } else if isClearAll(properties) {
+            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 {
-            pushViewController(viewController, animated: animated)
+            pushViewController(viewController, animated: true)
         }
     }

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

@@ -10,7 +10,7 @@ final class ViewController: VisitableViewController, ErrorPresenter {
         navigationItem.backButtonDisplayMode = .minimal
         if presentingViewController != nil {
-            navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(dismissModal))
+            navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(dismissModal))
         }
     }

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

@@ -31,8 +31,6 @@ final class SceneDelegate: UIResponder {
     private func configureRootViewController() {
         guard let window = window else { fatalError() }
-        window.tintColor = UIColor(named: "Tint")
         tabBarController = window.rootViewController as? UITabBarController
         navigationController1.session = session1
@@ -65,7 +63,7 @@ final class SceneDelegate: UIResponder {
     private func session() -> Session {
         navigationController().session
-    }
+    }
     // MARK: - Path Configuration

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Assets.xcassets/AccentColor.colorset/Contents.json CHANGED Viewed

@@ -1,6 +1,33 @@
 {
   "colors" : [
     {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.898",
+          "green" : "0.847",
+          "red" : "0.361"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.898",
+          "green" : "0.847",
+          "red" : "0.361"
+        }
+      },
       "idiom" : "universal"
     }
   ],

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

@@ -3,37 +3,23 @@
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Item 2-->
+        <!--Turbo Navigation Controller-->
         <scene sceneID="GwE-Ch-DRP">
             <objects>
-                <viewController id="cXb-wA-NUs" customClass="TurboNavigationController" customModule="ContactsIOS" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="WTF-II-zfk">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <viewLayoutGuide key="safeArea" id="CoL-dA-Hxa"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                    </view>
+                <viewController id="cXb-wA-NUs" customClass="TurboNavigationController" customModule="TurboNativeProjectIos" 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>
-        <!--Item 1-->
+        <!--Turbo Navigation Controller-->
         <scene sceneID="pAD-IL-Hdw">
             <objects>
-                <viewController id="0en-nE-vJA" customClass="TurboNavigationController" customModule="ContactsIOS" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="bFn-PZ-ClM">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <viewLayoutGuide key="safeArea" id="K5f-nY-Cgh"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                    </view>
+                <viewController id="0en-nE-vJA" customClass="TurboNavigationController" customModule="TurboNativeProjectIos" 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"/>
@@ -61,9 +47,6 @@
     </scenes>
     <resources>
         <image name="gear" catalog="system" width="128" height="122"/>
-        <image name="house" catalog="system" width="128" height="93"/>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
+        <image name="house" catalog="system" width="128" height="104"/>
     </resources>
 </document>

data/lib/turbo_native_initializer/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module TurboNativeInitializer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata CHANGED Viewed

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