Add Liquefied Effect and Restructure Files

Author: 1998code

Demo/Demo.xcodeproj/project.pbxproj

@@ -81,6 +81,7 @@
 				Samples/GlassFlower.swift,
 				Samples/GlassFlowerRotate.swift,
 				Samples/Input.swift,
+				Samples/Liquefied.swift,
 			);
 			target = 3A80CECB2DB4C144006BDD0A /* Watch Watch App */;
 		};
@@ -649,7 +650,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Demo/Demo.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 9;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -666,7 +667,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 15.4;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = media.1998.Demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -687,7 +688,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Demo/Demo.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 9;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -704,7 +705,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 15.4;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = media.1998.Demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -810,7 +811,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -821,7 +822,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = media.1998.Demo.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -839,7 +840,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -850,7 +851,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = media.1998.Demo.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;

Demo/Demo/Samples/Liquefied.swift

@@ -0,0 +1,135 @@
+//
+//  Liquefied.swift
+//  Demo
+//
+//  Created by Ming on 21/4/2025.
+//
+
+import SwiftUI
+import SwiftGlass
+
+struct Liquefied: View {
+    @State private var colorIndex: Int = 0
+    @State private var timer: Timer? = nil
+    
+    // Use computed properties to get current color and name
+    private var color: Color {
+        // Get the current color from colorOptions
+        return colorOptions[colorIndex].color
+    }
+    
+    private var colorName: String {
+        // Get the current color name from colorOptions
+        return colorOptions[colorIndex].name
+    }
+
+    var body: some View {
+        ZStack {
+            // Background color with opacity
+            color
+                .opacity(0.2)
+                .ignoresSafeArea()
+            VStack {
+                Spacer()
+                
+                // Animated color name text
+                Text(colorIndex == 0 ? "" : colorName)
+                    .font(.title2)
+                    .fontWeight(.heavy)
+                    .foregroundStyle(color)
+                    .padding(colorIndex == 0 ? 0 : 100)
+                    .liquefiedGlass(color: color, blobIntensity: 0.2)
+                    .contentTransition(.numericText(countsDown: true))
+                
+                // Uncomment below for animated circles
+                /*
+                if colorIndex == 0 {
+                    Spacer()
+                }
+                
+                ForEach(Array(zip([100, 50, 30, 10], [
+                    CGPoint(x: 40, y: 15),
+                    CGPoint(x: 70, y: 30),
+                    CGPoint(x: 90, y: 50),
+                    CGPoint(x: 110, y: 65),
+                ])), id: \.0) { size, offset in
+                    Circle()
+                        .fill(.clear)
+                        .liquefiedGlass(color: color, blobIntensity: 0.2)
+                        .frame(width: colorIndex == 0 ? 0 : CGFloat(size), height: colorIndex == 0 ? 0 : CGFloat(size))
+                        .offset(x: offset.x, y: offset.y)
+                }
+                */
+                
+                Spacer()
+                
+                // Uncomment below for footer label
+                /*
+                HStack {
+                    Spacer()
+                    Text("SwiftGlass 1.7 - Liquefied")
+                        .bold()
+                        .font(.caption)
+                        .foregroundStyle(color)
+                        .padding(25)
+                        .glass(color: color, shadowColor: color)
+                }
+                */
+            }
+            .multilineTextAlignment(.center)
+            .padding(.horizontal)
+        }
+        .onAppear {
+            // Start timer to cycle colors
+            timer = Timer.scheduledTimer(withTimeInterval: 2, repeats: true) { _ in
+                withAnimation(.easeInOut(duration: 1.5)) {
+                    colorIndex = (colorIndex + 1) % colorOptions.count
+                }
+            }
+        }
+        .onDisappear {
+            // Invalidate timer when view disappears
+            timer?.invalidate()
+            timer = nil
+        }
+    }
+}
+
+#Preview("Dark") {
+    Liquefied()
+        .preferredColorScheme(.dark)
+}
+
+// Create a ColorOption struct to keep color and name together
+private struct ColorOption {
+    let color: Color
+    let name: String
+}
+
+// Combined array of color options
+private let colorOptions: [ColorOption] = [
+    // SwiftUI Colors
+    ColorOption(color: .gray, name: "gray"),
+    ColorOption(color: .blue, name: "blue"),
+    ColorOption(color: .purple, name: "purple"),
+    ColorOption(color: .green, name: "green"),
+    ColorOption(color: .orange, name: "orange"),
+    ColorOption(color: .pink, name: "pink"),
+    ColorOption(color: .red, name: "red"),
+    ColorOption(color: .yellow, name: "yellow"),
+    ColorOption(color: .cyan, name: "cyan"),
+    ColorOption(color: .indigo, name: "indigo"),
+    ColorOption(color: .mint, name: "mint"),
+    ColorOption(color: .teal, name: "teal"),
+    ColorOption(color: .brown, name: "brown"),
+
+    // Luxury Collection
+    // ColorOption(color: Color(red: 0.98, green: 0.48, blue: 0.21), name: "Hermes Orange"),
+    // ColorOption(color: Color(red: 0.51, green: 0.85, blue: 0.82), name: "Tiffany Blue"),
+    // ColorOption(color: Color(red: 0.10, green: 0.50, blue: 0.26), name: "Gucci Green"),
+    // ColorOption(color: Color(red: 0.85, green: 0.79, blue: 0.72), name: "Burberry Beige"),
+    // ColorOption(color: Color(red: 0.76, green: 0.70, blue: 0.38), name: "Versace Gold"),
+    // ColorOption(color: Color(red: 0.98, green: 0.83, blue: 0.26), name: "Fendi Yellow"),
+    // ColorOption(color: Color(red: 0.71, green: 0.12, blue: 0.16), name: "Cartier Red"),
+    // ColorOption(color: Color(red: 0.30, green: 0.18, blue: 0.15), name: "Louis Vuitton Brown"),
+]

Sources/SwiftGlass/BlobGlassModifier.swift

@@ -0,0 +1,182 @@
+//
+//  BlobShape.swift
+//  SwiftGlass
+//
+//  Created by Ming on 21/4/2025.
+//
+
+import SwiftUI
+
+@available(iOS 15.0, macOS 14.0, watchOS 10.0, tvOS 15.0, visionOS 1.0, *)
+public struct BlobGlassModifier: ViewModifier {
+    // Parameters
+    let color: Color
+    let blobIntensity: CGFloat
+    let animationSpeed: Double
+    let complexity: Int
+    let material: Material
+    let gradientOpacity: Double
+    let shadowOpacity: Double
+    
+    // Animation state
+    @State private var animationProgress: CGFloat = 0.0
+    
+    // Initializer
+    public init(
+        color: Color,
+        blobIntensity: CGFloat,
+        animationSpeed: Double,
+        complexity: Int,
+        material: Material,
+        gradientOpacity: Double,
+        shadowOpacity: Double
+    ) {
+        self.color = color
+        self.blobIntensity = min(max(blobIntensity, 0.1), 1.0) // Constrain between 0.1 and 1.0
+        self.animationSpeed = animationSpeed
+        self.complexity = min(max(complexity, 4), 12) // Constrain between 4 and 12
+        self.material = material
+        self.gradientOpacity = gradientOpacity
+        self.shadowOpacity = shadowOpacity
+    }
+    
+    // ViewModifier Body
+    public func body(content: Content) -> some View {
+        content
+            // Clip content to animated blob shape
+            .clipShape(
+                BlobShape(
+                    complexity: complexity,
+                    animationProgress: animationProgress,
+                    intensity: blobIntensity
+                )
+            )
+            // Blob glass background and effects
+            .background(
+                BlobShape(
+                    complexity: complexity,
+                    animationProgress: animationProgress,
+                    intensity: blobIntensity
+                )
+                .fill(material)
+                .overlay(
+                    BlobShape(
+                        complexity: complexity,
+                        animationProgress: animationProgress,
+                        intensity: blobIntensity
+                    )
+                    .stroke(
+                        LinearGradient(
+                            colors: [
+                                color.opacity(gradientOpacity),
+                                color.opacity(0),
+                                color.opacity(gradientOpacity),
+                                color.opacity(0)
+                            ],
+                            startPoint: .topLeading,
+                            endPoint: .bottomTrailing
+                        ),
+                        lineWidth: 1.5
+                    )
+                )
+                .shadow(
+                    color: color.opacity(shadowOpacity),
+                    radius: 10,
+                    x: 0,
+                    y: 5
+                )
+            )
+            .onAppear {
+                // Start the continuous animation
+                withAnimation(
+                    Animation
+                        .linear(duration: 10 / animationSpeed)
+                        .repeatForever(autoreverses: true)
+                ) {
+                    animationProgress = 1.0
+                }
+            }
+    }
+}
+
+// BlobShape
+@available(iOS 15.0, macOS 14.0, watchOS 10.0, tvOS 15.0, visionOS 1.0, *)
+public struct BlobShape: Shape {
+    // Control points for the blob's perimeter
+    var controlPoints: [UnitPoint]
+    var animationProgress: CGFloat
+    var intensity: CGFloat
+    
+    // Initializer
+    public init(complexity: Int = 8, animationProgress: CGFloat = 0.0, intensity: CGFloat = 0.5) {
+        self.controlPoints = BlobShape.generateControlPoints(count: complexity)
+        self.animationProgress = animationProgress
+        self.intensity = intensity
+    }
+    
+    // Animatable
+    public var animatableData: CGFloat {
+        get { animationProgress }
+        set { animationProgress = newValue }
+    }
+    
+    // Path Generation
+    public func path(in rect: CGRect) -> Path {
+        let center = CGPoint(x: rect.midX, y: rect.midY)
+        let minDimension = min(rect.width, rect.height)
+        let radius = minDimension / 2
+        
+        // Calculate points on the blob's perimeter
+        let points = controlPoints.map { unitPoint -> CGPoint in
+            let angle = 2 * .pi * unitPoint.x + (animationProgress * 2 * .pi)
+            let distortionAmount = sin(angle * 3 + animationProgress * 4) * intensity * 0.2
+            let blobRadius = radius * (1 + distortionAmount)
+            let pointX = center.x + cos(angle) * blobRadius
+            let pointY = center.y + sin(angle) * blobRadius
+            return CGPoint(x: pointX, y: pointY)
+        }
+        
+        // Use cubic Bézier curves for smoothness
+        var path = Path()
+        guard points.count > 2 else { return path }
+        
+        path.move(to: points[0])
+        
+        // Calculate control points for smooth cubic Bézier curves
+        let count = points.count
+        for i in 0..<count {
+            let prev = points[(i - 1 + count) % count]
+            let curr = points[i]
+            let next = points[(i + 1) % count]
+            let next2 = points[(i + 2) % count]
+            
+            // Calculate control points for smoothness
+            let control1 = CGPoint(
+                x: curr.x + (next.x - prev.x) / 6,
+                y: curr.y + (next.y - prev.y) / 6
+            )
+            let control2 = CGPoint(
+                x: next.x - (next2.x - curr.x) / 6,
+                y: next.y - (next2.y - curr.y) / 6
+            )
+            
+            path.addCurve(to: next, control1: control1, control2: control2)
+        }
+        
+        path.closeSubpath()
+        return path
+    }
+    
+    // Helper: Generate evenly distributed control points around a circle
+    private static func generateControlPoints(count: Int) -> [UnitPoint] {
+        var points = [UnitPoint]()
+        let angleStep = 1.0 / CGFloat(count)
+        
+        for i in 0..<count {
+            let angle = CGFloat(i) * angleStep
+            points.append(UnitPoint(x: angle, y: angle))
+        }
+        
+        return points
+    }
+}