Optional Binding

1998code · 1998code · commit b20abf18c76e · 2024-05-29T21:07:34.000+08:00
diff --git a/Demo/What's New?.xcodeproj/project.pbxproj b/Demo/What's New?.xcodeproj/project.pbxproj
@@ -304,7 +304,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "What's New?/What_s_New_.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_ASSET_PATHS = "\"What's New?/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -318,7 +318,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 5.1;
+				MARKETING_VERSION = 5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.startway.WhatsNew;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -339,7 +339,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "What's New?/What_s_New_.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_ASSET_PATHS = "\"What's New?/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -353,7 +353,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 5.1;
+				MARKETING_VERSION = 5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.startway.WhatsNew;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
diff --git a/Demo/What's New?/ContentView.swift b/Demo/What's New?/ContentView.swift
@@ -10,49 +10,50 @@ import SwiftNEW
 
 struct ContentView: View {
     
-    @State var preview: String = "Normal"
+    @State var preview: String = "Simple"
     
     // MARK: All States
     @State var showNew: Bool = false
-    @State var align: HorizontalAlignment = .center
-    @State var color: Color = .accentColor
-    @State var size: String = "normal"
-    #if os(iOS) || os(xrOS)
-    @State var labelColor: Color = Color(UIColor.systemBackground)
-    #elseif os(macOS)
-    @State var labelColor: Color = Color(NSColor.windowBackgroundColor)
-    #endif
-    @State var label: String = "Show Release Note"
-    @State var labelImage: String = "arrow.up.circle.fill"
-    @State var history: Bool = true
-    @State var data: String = "data"
-    @State var showDrop: Bool = false
+//    Optional
+//    @State var align: HorizontalAlignment = .center
+//    @State var color: Color = .accentColor
+//    @State var size: String = "simple"
+//    #if os(iOS) || os(visionOS)
+//    @State var labelColor: Color = Color(UIColor.systemBackground)
+//    #elseif os(macOS)
+//    @State var labelColor: Color = Color(NSColor.windowBackgroundColor)
+//    #endif
+//    @State var label: String = "Show Release Note"
+//    @State var labelImage: String = "arrow.up.circle.fill"
+//    @State var history: Bool = true
+//    @State var data: String = "data"
+//    @State var showDrop: Bool = false
     
-    var normal: some View {
-        SwiftNEW(show: $showNew, align: $align, color: $color, size: $size, labelColor: $labelColor, label: $label, labelImage: $labelImage, history: $history, data: $data, showDrop: $showDrop)
+    var simple: some View {
+        SwiftNEW(show: $showNew)
     }
     
     var mini: some View {
         // MARK: Mini (Toolbar / List only)
         List {
             Section(header: Text("Compatible with Toolbar / List")) {
-                SwiftNEW(show: $showNew, align: $align, color: $color, size: .constant("mini"), labelColor: $labelColor, label: $label, labelImage: $labelImage, history: $history, data: $data, showDrop: $showDrop)
+                SwiftNEW(show: $showNew, size: .constant("mini"))
             }
         }
     }
     
     var invisible: some View {
-        SwiftNEW(show: $showNew, align: $align, color: $color, size: .constant("invisible"), labelColor: $labelColor, label: $label, labelImage: $labelImage, history: $history, data: $data, showDrop: $showDrop)
+        SwiftNEW(show: $showNew, size: .constant("invisible"))
     }
     
     var remote: some View {
         // MARK: Remote (>3.0.0) - Firebase Real Time Database Demo (Compatible with json format)
-        SwiftNEW(show: $showNew, align: $align, color: $color, size: $size, labelColor: $labelColor, label: $label, labelImage: .constant("icloud"), history: $history, data: .constant("https://testground-a937f-default-rtdb.firebaseio.com/.json?print=pretty"), showDrop: $showDrop)
+        SwiftNEW(show: $showNew, labelImage: .constant("icloud"), data: .constant("https://testground-a937f-default-rtdb.firebaseio.com/.json?print=pretty"))
     }
     
     var drop: some View {
         // MARK: Drop (>3.4.0) - Recommended trigger with Remote Notification
-        SwiftNEW(show: $showNew, align: $align, color: $color, size: $size, labelColor: $labelColor, label: .constant("Notification"), labelImage: .constant("bell.badge"), history: $history, data: .constant("https://testground-a937f-default-rtdb.firebaseio.com/.json?print=pretty"), showDrop: .constant(true))
+        SwiftNEW(show: $showNew, label: .constant("Notification"), labelImage: .constant("bell.badge"), data: .constant("https://testground-a937f-default-rtdb.firebaseio.com/.json?print=pretty"), showDrop: .constant(true))
     }
     
     var body: some View {
@@ -61,19 +62,19 @@ struct ContentView: View {
             tab
         }
         .navigationViewStyle(.stack)
-        #elseif os(macOS) || os(xrOS)
+        #elseif os(macOS) || os(visionOS)
         tab.padding()
         #endif
     }
     
     var tab: some View {
-        // MARK: Choose either one size (Normal, Mini or Invisible)
+        // MARK: Choose either one size (Simple, Mini or Invisible)
         TabView(selection: $preview) {
-            normal
+            simple
                 .tabItem {
-                    Label("Normal", systemImage: "textformat.size.larger")
+                    Label("Simple", systemImage: "textformat.size.larger")
                 }
-                .tag("Normal")
+                .tag("Simple")
             mini
                 .tabItem {
                     Label("Mini", systemImage: "textformat.size.smaller")
@@ -99,7 +100,7 @@ struct ContentView: View {
         }
         .toolbar {
             if preview == "Mini" {
-                SwiftNEW(show: $showNew, align: $align, color: $color, size: .constant("mini"), labelColor: $labelColor, label: $label, labelImage: $labelImage, history: $history, data: $data, showDrop: $showDrop)
+                SwiftNEW(show: $showNew, size: .constant("mini"))
             }
         }
     }
diff --git a/Demo/What's New?/en.lproj/data.json b/Demo/What's New?/en.lproj/data.json
@@ -1,4 +1,28 @@
 [
+    {
+        "version": "5.2",
+        "subVersion": "5.2.0",
+        "new": [
+            {
+                "icon": "hammer",
+                "title": "Default",
+                "subtitle": "Option",
+                "body": "New optional binding for less code."
+            },
+            {
+                "icon": "macpro.gen3.server",
+                "title": "Serverless",
+                "subtitle": "Design",
+                "body": "Free and open source! ❤️‍🔥"
+            },
+            {
+                "icon": "arrow.triangle.pull",
+                "title": "Contribute",
+                "subtitle": "Together",
+                "body": "Pull requests and make it better for everyone! 🎉"
+            }
+        ]
+    },
     {
         "version": "5.1",
         "subVersion": "5.1.0",
diff --git a/Demo/What's New?/zh-Hant.lproj/data.json b/Demo/What's New?/zh-Hant.lproj/data.json
@@ -1,4 +1,28 @@
 [
+    {
+        "version": "5.1",
+        "subVersion": "5.1.0",
+        "new": [
+            {
+                "icon": "hammer",
+                "title": "預設",
+                "subtitle": "選項",
+                "body": "減少重複程式碼"
+            },
+            {
+                "icon": "macpro.gen3.server",
+                "title": "無服務器",
+                "subtitle": "設計",
+                "body": "免費開源! ❤️‍🔥"
+            },
+            {
+                "icon": "arrow.triangle.pull",
+                "title": "貢獻",
+                "subtitle": "一起",
+                "body": "提出請求，變得更好! 🎉"
+            }
+        ]
+    },
     {
         "version": "5.1",
         "subVersion": "5.1.0",
diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ var         | Suggested                       | Options                       |
 showNew     | false                           | false, true                   | Bool
 align       | .center                         | .leading, .center, .trailing  | HorizontalAlignment
 color       | .accentColor                    | All Colors Supported          | Color
-size        | "normal"                        | "invisible", "mini", "normal" | String
+size        | "simple"                        | "invisible", "mini", "simple" | String
 labelColor  | Color(UIColor.systemBackground) or Color(NSColor.windowBackgroundColor) | All Colors Supported          | Color
 label       | "Show Release Note"             | All Strings                   | String
 labelImage  | "arrow.up.circle.fill"          | All SF Symbols                | String
diff --git a/Sources/SwiftNEW/SwiftNEW.swift b/Sources/SwiftNEW/SwiftNEW.swift
@@ -29,19 +29,57 @@ public struct SwiftNEW: View {
     @Binding var data: String
     @Binding var showDrop: Bool
     
-    public init( show: Binding<Bool>, align: Binding<HorizontalAlignment>, color: Binding<Color>, size: Binding<String>, labelColor: Binding<Color>, label: Binding<String>, labelImage: Binding<String>, history: Binding<Bool>, data: Binding<String>, showDrop: Binding<Bool>) {
+    #if os(iOS) || os(visionOS)
+    public init(
+        show: Binding<Bool>,
+        align: Binding<HorizontalAlignment>? = .constant(.center),
+        color: Binding<Color>? = .constant(Color.accentColor),
+        size: Binding<String>? = .constant("simple"),
+        labelColor: Binding<Color>? = .constant(Color(UIColor.systemBackground)),
+        label: Binding<String>? = .constant("Show Release Note"),
+        labelImage: Binding<String>? = .constant("arrow.up.circle.fill"),
+        history: Binding<Bool>? = .constant(true),
+        data: Binding<String>? = .constant("data"),
+        showDrop: Binding<Bool>? = .constant(false)
+    ) {
         _show = show
-        _align = align
-        _color = color
-        _size = size
-        _labelColor = labelColor
-        _label = label
-        _labelImage = labelImage
-        _history = history
-        _data = data
-        _showDrop = showDrop
+        _align = align ?? .constant(.center)
+        _color = color ?? .constant(Color.accentColor)
+        _size = size ?? .constant("simple")
+        _labelColor = labelColor ?? .constant(Color(UIColor.systemBackground))
+        _label = label ?? .constant("Show Release Note")
+        _labelImage = labelImage ?? .constant("arrow.up.circle.fill")
+        _history = history ?? .constant(true)
+        _data = data ?? .constant("data")
+        _showDrop = showDrop ?? .constant(false)
         compareVersion()
     }
+    #elseif os(macOS)
+    public init(
+        show: Binding<Bool>,
+        align: Binding<HorizontalAlignment>? = .constant(.center),
+        color: Binding<Color>? = .constant(Color.accentColor),
+        size: Binding<String>? = .constant("simple"),
+        labelColor: Binding<Color>? = .constant(Color(NSColor.windowBackgroundColor)),
+        label: Binding<String>? = .constant("Show Release Note"),
+        labelImage: Binding<String>? = .constant("arrow.up.circle.fill"),
+        history: Binding<Bool>? = .constant(true),
+        data: Binding<String>? = .constant("data"),
+        showDrop: Binding<Bool>? = .constant(false)
+    ) {
+        _show = show
+        _align = align ?? .constant(.center)
+        _color = color ?? .constant(Color.accentColor)
+        _size = size ?? .constant("simple")
+        _labelColor = labelColor ?? .constant(Color(NSColor.windowBackgroundColor))
+        _label = label ?? .constant("Show Release Note")
+        _labelImage = labelImage ?? .constant("arrow.up.circle.fill")
+        _history = history ?? .constant(true)
+        _data = data ?? .constant("data")
+        _showDrop = showDrop ?? .constant(false)
+        compareVersion()
+    }
+    #endif
     
     public var body: some View {
         Button(action: {
@@ -56,7 +94,7 @@ public struct SwiftNEW: View {
             if size == "mini" {
                 Label(label, systemImage: labelImage)
             }
-            else if size == "normal" {
+            else if size == "normal" || size == "simple" {
                 Label(label, systemImage: labelImage)
                     .frame(width: 300, height: 50)
 #if os(iOS) && !os(xrOS)
