Global Notification System (#1984)

Author: austincondiff

CodeEdit.xcodeproj/project.pbxproj

@@ -9,12 +9,18 @@ import SwiftUI
 
 extension ButtonStyle where Self == BlurButtonStyle {
     static var blur: BlurButtonStyle { BlurButtonStyle() }
+    static var secondaryBlur: BlurButtonStyle { BlurButtonStyle(isSecondary: true) }
 }
 
 struct BlurButtonStyle: ButtonStyle {
+    var isSecondary: Bool = false
+
     @Environment(\.controlSize)
     var controlSize
 
+    @Environment(\.colorScheme)
+    var colorScheme
+
     var height: CGFloat {
         switch controlSize {
         case .large:
@@ -24,32 +30,40 @@ struct BlurButtonStyle: ButtonStyle {
         }
     }
 
-    @Environment(\.colorScheme)
-    var colorScheme
-
     func makeBody(configuration: Configuration) -> some View {
         configuration.label
+            .padding(.horizontal, 8)
             .frame(height: height)
-            .buttonStyle(.bordered)
             .background {
                 switch colorScheme {
                 case .dark:
-                    Color
-                        .gray
-                        .opacity(0.001)
-                        .overlay(.regularMaterial.blendMode(.plusLighter))
-                        .overlay(Color.gray.opacity(0.30))
-                        .overlay(Color.white.opacity(configuration.isPressed ? 0.20 : 0.00))
+                    ZStack {
+                        Color.gray.opacity(0.001)
+                        if isSecondary {
+                            Rectangle()
+                                .fill(.regularMaterial)
+                        } else {
+                            Rectangle()
+                                .fill(.regularMaterial)
+                                .blendMode(.plusLighter)
+                        }
+                        Color.gray.opacity(isSecondary ? 0.10 : 0.30)
+                        Color.white.opacity(configuration.isPressed ? 0.10 : 0.00)
+                    }
                 case .light:
-                    Color
-                        .gray
-                        .opacity(0.001)
-                        .overlay(.regularMaterial.blendMode(.darken))
-                        .overlay(Color.gray.opacity(0.15).blendMode(.plusDarker))
+                    ZStack {
+                        Color.gray.opacity(0.001)
+                        Rectangle()
+                            .fill(.regularMaterial)
+                            .blendMode(.darken)
+                        Color.gray.opacity(isSecondary ? 0.05 : 0.15)
+                            .blendMode(.plusDarker)
+                        Color.gray.opacity(configuration.isPressed ? 0.10 : 0.00)
+                    }
                 @unknown default:
                     Color.black
                 }
             }
-            .clipShape(RoundedRectangle(cornerRadius: 6))
+            .clipShape(RoundedRectangle(cornerRadius: controlSize == .large ? 6 : 5))
     }
 }

CodeEdit/Features/About/Views/BlurButtonStyle.swift

@@ -76,7 +76,7 @@ import Combine
 ///         "id": "uniqueTaskID",
 ///         "action": "update",
 ///         "title": "Updated Task Title",
-///         "message": "Updated Task Message"
+///         "message": "Updated Task Message",
 ///         "percentage": 0.5,
 ///         "isLoading": true
 ///     ]

CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationHandler.swift

@@ -0,0 +1,34 @@
+import SwiftUI
+
+/// A button style for overlay buttons (like close, action buttons in notifications)
+struct OverlayButtonStyle: ButtonStyle {
+    @Environment(\.colorScheme)
+    private var colorScheme
+
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .font(.system(size: 10))
+            .foregroundColor(.secondary)
+            .frame(width: 20, height: 20, alignment: .center)
+            .background(Color.primary.opacity(configuration.isPressed ? colorScheme == .dark ? 0.10 : 0.05 : 0.00))
+            .background(.regularMaterial)
+            .overlay(
+                RoundedRectangle(cornerRadius: 10)
+                    .stroke(Color(nsColor: .separatorColor), lineWidth: 2)
+            )
+            .cornerRadius(10)
+            .shadow(
+                color: Color(.black.withAlphaComponent(colorScheme == .dark ? 0.2 : 0.1)),
+                radius: 5,
+                x: 0,
+                y: 2
+            )
+    }
+}
+
+extension ButtonStyle where Self == OverlayButtonStyle {
+    /// A button style for overlay buttons
+    static var overlay: OverlayButtonStyle {
+        OverlayButtonStyle()
+    }
+}

CodeEdit/Features/CodeEditUI/Views/IconButtonStyle.swift renamed to CodeEdit/Features/CodeEditUI/Styles/IconButtonStyle.swift

@@ -0,0 +1,98 @@
+//
+//  FeatureIcon.swift
+//  CodeEdit
+//
+//  Created by Austin Condiff on 12/2/24.
+//
+
+import SwiftUI
+import CodeEditSymbols
+
+struct FeatureIcon: View {
+    private let content: IconContent
+    private let color: Color?
+    private let size: CGFloat
+
+    init(
+        symbol: String,
+        color: Color? = nil,
+        size: CGFloat? = nil
+    ) {
+        self.content = .symbol(symbol)
+        self.color = color ?? .accentColor
+        self.size = size ?? 20
+    }
+
+    init(
+        text: String,
+        textColor: Color? = nil,
+        color: Color? = nil,
+        size: CGFloat? = nil
+    ) {
+        self.content = .text(text, textColor: textColor)
+        self.color = color ?? .accentColor
+        self.size = size ?? 20
+    }
+
+    init(
+        image: Image,
+        size: CGFloat? = nil
+    ) {
+        self.content = .image(image)
+        self.color = nil
+        self.size = size ?? 20
+    }
+
+    private func getSafeImage(named: String) -> Image {
+        if NSImage(systemSymbolName: named, accessibilityDescription: nil) != nil {
+            return Image(systemName: named)
+        } else {
+            return Image(symbol: named)
+        }
+    }
+
+    var body: some View {
+        RoundedRectangle(cornerRadius: size / 4, style: .continuous)
+            .fill(background)
+            .overlay {
+                switch content {
+                case let .symbol(name):
+                    getSafeImage(named: name)
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                        .foregroundColor(.white)
+                        .padding(size / 8)
+                case let .text(text, textColor):
+                    Text(text)
+                        .font(.system(size: size * 0.65))
+                        .foregroundColor(textColor ?? .primary)
+                case let .image(image):
+                    image
+                        .resizable()
+                        .aspectRatio(contentMode: .fill)
+                }
+            }
+            .clipShape(RoundedRectangle(cornerRadius: size / 4, style: .continuous))
+            .shadow(
+                color: Color(NSColor.black).opacity(0.25),
+                radius: size / 40,
+                y: size / 40
+            )
+            .frame(width: size, height: size)
+    }
+
+    private var background: AnyShapeStyle {
+        switch content {
+        case .symbol, .text:
+            return AnyShapeStyle((color ?? .accentColor).gradient)
+        case .image:
+            return AnyShapeStyle(.regularMaterial)
+        }
+    }
+}
+
+private enum IconContent {
+    case symbol(String)
+    case text(String, textColor: Color?)
+    case image(Image)
+}

CodeEdit/Features/CodeEditUI/Views/IconToggleStyle.swift renamed to CodeEdit/Features/CodeEditUI/Styles/IconToggleStyle.swift

@@ -0,0 +1,10 @@
+import SwiftUI
+
+/// Tracks scroll offset in scrollable views
+struct ScrollOffsetPreferenceKey: PreferenceKey {
+    typealias Value = CGFloat
+    static var defaultValue = CGFloat.zero
+    static func reduce(value: inout Value, nextValue: () -> Value) {
+        value += nextValue()
+    }
+}