4.0 Update

1998code · 1998code · commit 09f9b5b79efd · 2023-06-15T12:18:13.000+08:00
diff --git a/Demo/What's New?.xcodeproj/project.pbxproj b/Demo/What's New?.xcodeproj/project.pbxproj
@@ -3,17 +3,17 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3A23CAF52A3AC05C0099CC42 /* SwiftNEW in Frameworks */ = {isa = PBXBuildFile; productRef = 3A23CAF42A3AC05C0099CC42 /* SwiftNEW */; };
 		3A46CBB0285444CC00BE79A3 /* What_s_New_App.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A46CBAF285444CC00BE79A3 /* What_s_New_App.swift */; };
 		3A46CBB2285444CC00BE79A3 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A46CBB1285444CC00BE79A3 /* ContentView.swift */; };
 		3A46CBB4285444CD00BE79A3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3A46CBB3285444CD00BE79A3 /* Assets.xcassets */; };
 		3A46CBB8285444CD00BE79A3 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3A46CBB7285444CD00BE79A3 /* Preview Assets.xcassets */; };
 		3AB7E09128630E380059EEFE /* SwiftNEW in Frameworks */ = {isa = PBXBuildFile; productRef = 3AB7E09028630E380059EEFE /* SwiftNEW */; };
 		3AE0026A2962DD540055979A /* data.json in Resources */ = {isa = PBXBuildFile; fileRef = 3AE0026C2962DD540055979A /* data.json */; };
-		3AE7A52728BDB0BF00B4789E /* SwiftNEW in Frameworks */ = {isa = PBXBuildFile; productRef = 3AE7A52628BDB0BF00B4789E /* SwiftNEW */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -34,7 +34,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				3AB7E09128630E380059EEFE /* SwiftNEW in Frameworks */,
-				3AE7A52728BDB0BF00B4789E /* SwiftNEW in Frameworks */,
+				3A23CAF52A3AC05C0099CC42 /* SwiftNEW in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -105,7 +105,7 @@
 			name = "What's New?";
 			packageProductDependencies = (
 				3AB7E09028630E380059EEFE /* SwiftNEW */,
-				3AE7A52628BDB0BF00B4789E /* SwiftNEW */,
+				3A23CAF42A3AC05C0099CC42 /* SwiftNEW */,
 			);
 			productName = "What's New?";
 			productReference = 3A46CBAC285444CC00BE79A3 /* What's New?.app */;
@@ -137,7 +137,7 @@
 			);
 			mainGroup = 3A46CBA3285444CC00BE79A3;
 			packageReferences = (
-				3AE7A52528BDB0BF00B4789E /* XCRemoteSwiftPackageReference "SwiftNEWKit" */,
+				3A23CAF32A3AC05C0099CC42 /* XCLocalSwiftPackageReference ".." */,
 			);
 			productRefGroup = 3A46CBAD285444CC00BE79A3 /* Products */;
 			projectDirPath = "";
@@ -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 = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				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 = 11.0;
-				MARKETING_VERSION = 3.9;
+				MARKETING_VERSION = 4.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.startway.WhatsNew;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -336,7 +336,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 = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_ASSET_PATHS = "\"What's New?/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -350,7 +350,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 3.9;
+				MARKETING_VERSION = 4.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.startway.WhatsNew;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -384,25 +384,20 @@
 		};
 /* End XCConfigurationList section */
 
-/* Begin XCRemoteSwiftPackageReference section */
-		3AE7A52528BDB0BF00B4789E /* XCRemoteSwiftPackageReference "SwiftNEWKit" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/1998code/SwiftNEWKit";
-			requirement = {
-				branch = main;
-				kind = branch;
-			};
+/* Begin XCLocalSwiftPackageReference section */
+		3A23CAF32A3AC05C0099CC42 /* XCLocalSwiftPackageReference ".." */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = ..;
 		};
-/* End XCRemoteSwiftPackageReference section */
+/* End XCLocalSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		3AB7E09028630E380059EEFE /* SwiftNEW */ = {
+		3A23CAF42A3AC05C0099CC42 /* SwiftNEW */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = SwiftNEW;
 		};
-		3AE7A52628BDB0BF00B4789E /* SwiftNEW */ = {
+		3AB7E09028630E380059EEFE /* SwiftNEW */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 3AE7A52528BDB0BF00B4789E /* XCRemoteSwiftPackageReference "SwiftNEWKit" */;
 			productName = SwiftNEW;
 		};
 /* End XCSwiftPackageProductDependency section */
diff --git a/Demo/What's New?.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/What's New?.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Demo/What's New?.xcodeproj/xcshareddata/xcschemes/What's New?.xcscheme b/Demo/What's New?.xcodeproj/xcshareddata/xcschemes/What's New?.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1400"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3A46CBAB285444CC00BE79A3"
+               BuildableName = "What&apos;s New?.app"
+               BlueprintName = "What&apos;s New?"
+               ReferencedContainer = "container:What&apos;s New?.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3A46CBAB285444CC00BE79A3"
+            BuildableName = "What&apos;s New?.app"
+            BlueprintName = "What&apos;s New?"
+            ReferencedContainer = "container:What&apos;s New?.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3A46CBAB285444CC00BE79A3"
+            BuildableName = "What&apos;s New?.app"
+            BlueprintName = "What&apos;s New?"
+            ReferencedContainer = "container:What&apos;s New?.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Demo/What's New?/ContentView.swift b/Demo/What's New?/ContentView.swift
@@ -33,8 +33,12 @@ struct ContentView: View {
     }
     
     var mini: some View {
-        // MARK: Mini (Toolbar only)
-        Text("Compatible with Toolbar")
+        // 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)
+            }
+        }
     }
     
     var invisible: some View {
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": "4.0",
+        "subVersion": "4.0.0",
+        "new": [
+            {
+                "icon": "number",
+                "title": "Better Compatible",
+                "subtitle": "in Version & Build",
+                "body": "You can use x.y.z or x.y now."
+            },
+            {
+                "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": "3.9",
         "new": [
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": "4.0",
+        "subVersion": "4.0.0",
+        "new": [
+            {
+                "icon": "number",
+                "title": "更好兼容性",
+                "subtitle": "在版本和構建中",
+                "body": "您現在可以使用 x.y.z 或 x.y。"
+            },
+            {
+                "icon": "macpro.gen3.server",
+                "title": "無服務器",
+                "subtitle": "設計",
+                "body": "免費開源! ❤️‍🔥"
+            },
+            {
+                "icon": "arrow.triangle.pull",
+                "title": "貢獻",
+                "subtitle": "一起",
+                "body": "提出請求，變得更好! 🎉"
+            }
+        ]
+    },
     {
         "version": "3.9",
         "new": [
diff --git a/Sources/SwiftNEW/SwiftNEW.swift b/Sources/SwiftNEW/SwiftNEW.swift
@@ -92,7 +92,7 @@ public struct SwiftNEW: View {
             else {
                 ScrollView(showsIndicators: false) {
                     ForEach(items, id: \.self) { item in
-                        if item.version == Bundle.version {
+                        if item.version == Bundle.version || item.subVersion == Bundle.version {
                             ForEach(item.new, id: \.self) { new in
                                 HStack {
                                     ZStack {
@@ -277,7 +277,13 @@ public struct SwiftNEW: View {
 
     // MARK: - Functions
     public func compareVersion() {
-        if Double(Bundle.version)! > version || Double(Bundle.build)! > build {
+        let currentVersion = Bundle.version.replacingOccurrences(of: ".", with: "")
+        let currentBuild = Bundle.build.replacingOccurrences(of: ".", with: "")
+
+        let savedVersion = String(version).replacingOccurrences(of: ".", with: "")
+        let savedBuild = String(build).replacingOccurrences(of: ".", with: "")
+
+        if Int(currentVersion)! != Int(savedVersion)! || Int(currentBuild)! != Int(savedBuild)! {
             withAnimation {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                     if showDrop {
@@ -288,8 +294,8 @@ public struct SwiftNEW: View {
                         show = true
                     }
                 }
-                version = Double(Bundle.version)!
-                build = Double(Bundle.build)!
+                version = Double(currentVersion)! / 10
+                build = Double(currentBuild)! / 10
             }
         }
     }
@@ -339,6 +345,7 @@ public struct SwiftNEW: View {
 // MARK: - Model
 public struct Vmodel: Codable, Hashable {
     var version: String
+    var subVersion: String?
     var new: [Model]
 }
 public struct Model: Codable, Hashable {

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,12 @@ struct ContentView: View {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`var mini: some View {`
`36`		`- // MARK: Mini (Toolbar only)`
`37`		`- Text("Compatible with Toolbar")`
	`36`	`+ // MARK: Mini (Toolbar / List only)`
	`37`	`+ List {`
	`38`	`+ Section(header: Text("Compatible with Toolbar / List")) {`
	`39`	`+ SwiftNEW(show: $showNew, align: $align, color: $color, size: .constant("mini"), labelColor: $labelColor, label: $label, labelImage: $labelImage, history: $history, data: $data, showDrop: $showDrop)`
	`40`	`+ }`
	`41`	`+ }`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`var invisible: some View {`