Add ColorfulX and Colorful frameworks

wibus-wee · Jan 21, 2024 · 20ec595 · 20ec595
1 parent cb29edc
commit 20ec595
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 22 deletions.
diff --git a/PhotosProcessor.xcodeproj/project.pbxproj b/PhotosProcessor.xcodeproj/project.pbxproj
@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		380769702AC055F90066C7FE /* ImageUniversalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3807696F2AC055F90066C7FE /* ImageUniversalView.swift */; };
 		380769722AC482A50066C7FE /* AnyDataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 380769712AC482A50066C7FE /* AnyDataView.swift */; };
+		38697DE62B5CC79700BE4A3E /* ColorfulX in Frameworks */ = {isa = PBXBuildFile; productRef = 38697DE52B5CC79700BE4A3E /* ColorfulX */; };
+		38697DE92B5CCB3600BE4A3E /* Colorful in Frameworks */ = {isa = PBXBuildFile; productRef = 38697DE82B5CCB3600BE4A3E /* Colorful */; };
 		386C09E32B3858EF0060FDA5 /* ISStegoDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 386C09D62B3858EF0060FDA5 /* ISStegoDecoder.m */; };
 		386C09E42B3858EF0060FDA5 /* ISSteganographer.m in Sources */ = {isa = PBXBuildFile; fileRef = 386C09D82B3858EF0060FDA5 /* ISSteganographer.m */; };
 		386C09E52B3858EF0060FDA5 /* ISStegoDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 386C09DA2B3858EF0060FDA5 /* ISStegoDefaults.m */; };
@@ -17,7 +19,6 @@
 		386C09E82B3858EF0060FDA5 /* ISStegoEncoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 386C09E12B3858EF0060FDA5 /* ISStegoEncoder.m */; };
 		3874B1EA2AC6AAEE00790925 /* NSTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3874B1E92AC6AAEE00790925 /* NSTextView.swift */; };
 		3874B1EC2AC6B14F00790925 /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3874B1EB2AC6B14F00790925 /* View.swift */; };
-		3874B1EF2AC6B1CD00790925 /* Colorful in Frameworks */ = {isa = PBXBuildFile; productRef = 3874B1EE2AC6B1CD00790925 /* Colorful */; };
 		3874B1F52AC6B4DC00790925 /* KeyboardShortcuts in Frameworks */ = {isa = PBXBuildFile; productRef = 3874B1F42AC6B4DC00790925 /* KeyboardShortcuts */; };
 		3874B1F72AC6B50000790925 /* KeyboardShortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3874B1F62AC6B50000790925 /* KeyboardShortcuts.swift */; };
 		3874B1F92AC6BB3C00790925 /* SelectedFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3874B1F82AC6BB3C00790925 /* SelectedFile.swift */; };
@@ -112,9 +113,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3874B1EF2AC6B1CD00790925 /* Colorful in Frameworks */,
 				38DC562C2ABFC15C00DC6408 /* LaunchAtLogin in Frameworks */,
 				3874B1F52AC6B4DC00790925 /* KeyboardShortcuts in Frameworks */,
+				38697DE92B5CCB3600BE4A3E /* Colorful in Frameworks */,
+				38697DE62B5CC79700BE4A3E /* ColorfulX in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -325,8 +327,9 @@
 			name = PhotosProcessor;
 			packageProductDependencies = (
 				38DC562B2ABFC15C00DC6408 /* LaunchAtLogin */,
-				3874B1EE2AC6B1CD00790925 /* Colorful */,
 				3874B1F42AC6B4DC00790925 /* KeyboardShortcuts */,
+				38697DE52B5CC79700BE4A3E /* ColorfulX */,
+				38697DE82B5CCB3600BE4A3E /* Colorful */,
 			);
 			productName = PhotosProcessor;
 			productReference = 38F8931C2AAD544D008414D9 /* PhotosProcessor.app */;
@@ -358,8 +361,9 @@
 			mainGroup = 38F893132AAD544D008414D9;
 			packageReferences = (
 				38DC562A2ABFC15C00DC6408 /* XCRemoteSwiftPackageReference "LaunchAtLogin" */,
-				3874B1ED2AC6B1CD00790925 /* XCRemoteSwiftPackageReference "Colorful" */,
 				3874B1F32AC6B4DC00790925 /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */,
+				38697DE42B5CC79700BE4A3E /* XCRemoteSwiftPackageReference "ColorfulX" */,
+				38697DE72B5CCB3600BE4A3E /* XCRemoteSwiftPackageReference "Colorful" */,
 			);
 			productRefGroup = 38F8931D2AAD544D008414D9 /* Products */;
 			projectDirPath = "";
@@ -582,11 +586,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.wibus-wee.PhotosProcessor";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
+				SUPPORTED_PLATFORMS = macosx;
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PhotosProcessor/App/Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -625,11 +630,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.wibus-wee.PhotosProcessor";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
+				SUPPORTED_PLATFORMS = macosx;
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PhotosProcessor/App/Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -657,12 +663,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		3874B1ED2AC6B1CD00790925 /* XCRemoteSwiftPackageReference "Colorful" */ = {
+		38697DE42B5CC79700BE4A3E /* XCRemoteSwiftPackageReference "ColorfulX" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/Lakr233/Colorful";
+			repositoryURL = "https://github.com/Lakr233/ColorfulX.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
+				minimumVersion = 2.0.0;
+			};
+		};
+		38697DE72B5CCB3600BE4A3E /* XCRemoteSwiftPackageReference "Colorful" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Lakr233/Colorful";
+			requirement = {
+				branch = main;
+				kind = branch;
 			};
 		};
 		3874B1F32AC6B4DC00790925 /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */ = {
@@ -684,9 +698,14 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		3874B1EE2AC6B1CD00790925 /* Colorful */ = {
+		38697DE52B5CC79700BE4A3E /* ColorfulX */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 38697DE42B5CC79700BE4A3E /* XCRemoteSwiftPackageReference "ColorfulX" */;
+			productName = ColorfulX;
+		};
+		38697DE82B5CCB3600BE4A3E /* Colorful */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 3874B1ED2AC6B1CD00790925 /* XCRemoteSwiftPackageReference "Colorful" */;
+			package = 38697DE72B5CCB3600BE4A3E /* XCRemoteSwiftPackageReference "Colorful" */;
 			productName = Colorful;
 		};
 		3874B1F42AC6B4DC00790925 /* KeyboardShortcuts */ = {

diff --git a/PhotosProcessor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PhotosProcessor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Lakr233/Colorful",
       "state" : {
-        "revision" : "0bcf960c856d9f7cde10a0b464208585736c5e47",
-        "version" : "1.1.0"
+        "branch" : "main",
+        "revision" : "da58c0721998f258d3cdd76a16beb2ab54aae7b6"
+      }
+    },
+    {
+      "identity" : "colorfulx",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Lakr233/ColorfulX.git",
+      "state" : {
+        "revision" : "11aae9e92a2f846ed26d275d0d3d6fad85d16837",
+        "version" : "2.3.1"
       }
     },
     {
@@ -26,6 +35,15 @@
         "branch" : "main",
         "revision" : "8e28b5e5a9561ace33a26c55d78f74963fbce6f9"
       }
+    },
+    {
+      "identity" : "springinterpolation",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Lakr233/SpringInterpolation.git",
+      "state" : {
+        "revision" : "be8721cffc87ec514fa13ba5dab586a2730f51c9",
+        "version" : "1.1.2"
+      }
     }
   ],
   "version" : 2

diff --git a/PhotosProcessor/Views/WelcomeView.swift b/PhotosProcessor/Views/WelcomeView.swift
@@ -5,9 +5,8 @@
 //  Created by wibus on 2023/9/10.
 //
 
-
-import SwiftUI
 import Colorful
+import SwiftUI
 
 struct WelcomeView: View {
     // let timer = Timer
@@ -28,8 +27,8 @@ struct WelcomeView: View {
 
     var body: some View {
         ZStack {
-             ColorfulView(colorCount: 4)
-                    .ignoresSafeArea()
+            ColorfulView(colorCount: 4)
+                .ignoresSafeArea()
             VStack(spacing: 4) {
                 Image("Avatar")
                     .antialiased(true)
@@ -53,11 +52,9 @@ struct WelcomeView: View {
                     .opacity(0.5)
             }
             .padding()
-
         }
         .toolbar {
-            Group {
-            }
+            Group {}
         }
         .frame(minWidth: 400, minHeight: 200)
         .navigationTitle("PhotosProcessor")