Moved CloseButtonStyle into CodeEditUI and renamed it OverlayButtonStyle

Author: austincondiff

CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationHandler.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/CodeEditUI/Styles/OverlayButtonStyle.swift

@@ -2,25 +2,27 @@ import SwiftUI
 
 /// A button style for overlay buttons (like close, action buttons in notifications)
 struct OverlayButtonStyle: ButtonStyle {
-    @Environment(\.isEnabled)
-    private var isEnabled
-
-    @Environment(\.controlActiveState)
-    private var controlActive
+    @Environment(\.colorScheme)
+    private var colorScheme
 
     func makeBody(configuration: Configuration) -> some View {
         configuration.label
-            .foregroundColor(
-                isEnabled
-                ? (configuration.isPressed
-                   ? .primary.opacity(0.3)
-                   : (controlActive == .inactive
-                      ? .primary.opacity(0.5)
-                      : .primary.opacity(0.7)))
-                : .primary.opacity(0.3)
+            .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
             )
-            .padding(4)
-            .contentShape(Rectangle())
     }
 }
 

CodeEdit/Features/InspectorArea/FileInspector/FileInspectorView.swift

@@ -82,19 +82,16 @@ struct FileInspectorView: View {
     }
 
     @ViewBuilder private var fileNameField: some View {
-        @State var isValid: Bool = true
-
         if let file {
             TextField("Name", text: $fileName)
                 .background(
-                    isValid ? Color.clear : Color(errorRed)
+                    fileName != file.fileName() && !file.validateFileName(for: fileName) ? Color(errorRed) : Color.clear
                 )
                 .onSubmit {
                     if file.validateFileName(for: fileName) {
                         let destinationURL = file.url
                             .deletingLastPathComponent()
                             .appendingPathComponent(fileName)
-                        isValid = true
                         DispatchQueue.main.async { [weak workspace] in
                             do {
                                 if let newItem = try workspace?.workspaceFileManager?.move(
@@ -112,7 +109,6 @@ struct FileInspectorView: View {
                             }
                         }
                     } else {
-                        isValid = false
                         fileName = file.labelFileName()
                     }
                 }

CodeEdit/Features/Notifications/Views/NotificationBannerView.swift

@@ -7,31 +7,6 @@
 
 import SwiftUI
 
-struct CloseButtonStyle: 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
-            )
-    }
-}
-
 struct NotificationBannerView: View {
     @Environment(\.colorScheme)
     private var colorScheme
@@ -149,7 +124,7 @@ struct NotificationBannerView: View {
                 Button(action: onDismiss) {
                     Image(systemName: "xmark")
                 }
-                .buttonStyle(CloseButtonStyle())
+                .buttonStyle(.overlay)
                 .padding(.top, -5)
                 .padding(.leading, -5)
                 .transition(.opacity)