Refactored Activities (previously TaskNotifications) to have a clear distinction in name and have a consistent API when compared with Notifications.

Author: austincondiff

CodeEdit.xcodeproj/project.pbxproj

@@ -0,0 +1,107 @@
+//
+//  ActivityManager.swift
+//  CodeEdit
+//
+//  Created by Tommy Ludwig on 21.06.24.
+//
+
+import Foundation
+import Combine
+import SwiftUI
+
+/// Manages activities for a workspace
+final class ActivityManager: ObservableObject {
+    /// Currently displayed activities
+    @Published private(set) var activities: [CEActivity] = []
+
+    /// Posts a new activity
+    /// - Parameters:
+    ///   - priority: Whether to insert at start of list
+    ///   - title: Activity title
+    ///   - message: Optional detail message
+    ///   - percentage: Optional progress percentage (0-1)
+    ///   - isLoading: Whether activity shows loading indicator
+    /// - Returns: The created activity
+    @discardableResult
+    func post(
+        priority: Bool = false,
+        title: String,
+        message: String? = nil,
+        percentage: Double? = nil,
+        isLoading: Bool = false
+    ) -> CEActivity {
+        let activity = CEActivity(
+            id: UUID().uuidString,
+            title: title,
+            message: message,
+            percentage: percentage,
+            isLoading: isLoading
+        )
+
+        withAnimation(.easeInOut(duration: 0.3)) {
+            if priority {
+                activities.insert(activity, at: 0)
+            } else {
+                activities.append(activity)
+            }
+        }
+
+        return activity
+    }
+
+    /// Updates an existing activity
+    /// - Parameters:
+    ///   - id: ID of activity to update
+    ///   - title: New title (optional)
+    ///   - message: New message (optional) 
+    ///   - percentage: New progress percentage (optional)
+    ///   - isLoading: New loading state (optional)
+    func update(
+        id: String,
+        title: String? = nil,
+        message: String? = nil, 
+        percentage: Double? = nil,
+        isLoading: Bool? = nil
+    ) {
+        if let index = activities.firstIndex(where: { $0.id == id }) {
+            var activity = activities[index]
+            
+            if let title = title {
+                activity.title = title
+            }
+            if let message = message {
+                activity.message = message
+            }
+            if let percentage = percentage {
+                activity.percentage = percentage
+            }
+            if let isLoading = isLoading {
+                activity.isLoading = isLoading
+            }
+
+            activities[index] = activity
+        }
+    }
+
+    /// Deletes an activity
+    /// - Parameter id: ID of activity to delete
+    func delete(id: String) {
+        withAnimation(.easeInOut(duration: 0.3)) {
+            activities.removeAll { $0.id == id }
+        }
+    }
+
+    /// Deletes an activity after a delay
+    /// - Parameters:
+    ///   - id: ID of activity to delete
+    ///   - delay: Time to wait before deleting
+    func delete(id: String, delay: TimeInterval) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
+            self?.delete(id: id)
+        }
+    }
+}
+
+extension Notification.Name {
+    static let activity = Notification.Name("activity")
+}

CodeEdit/Features/Activities/ActivityManager.swift

@@ -1,14 +1,14 @@
 //
-//  TaskNotificationModel.swift
+//  CEActivity.swift
 //  CodeEdit
 //
 //  Created by Tommy Ludwig on 21.06.24.
 //
 
 import Foundation
 
-/// Represents a notifications or tasks, that are displayed in the activity viewer
-struct TaskNotificationModel: Equatable {
+/// Represents an activity, that is displayed in the activity viewer
+struct CEActivity: Equatable {
     var id: String
     var title: String
     var message: String?

…iewer/Models/TaskNotificationModel.swift …tures/Activities/Models/CEActivity.swiftCodeEdit/Features/ActivityViewer/Models/TaskNotificationModel.swift renamed to CodeEdit/Features/Activities/Models/CEActivity.swift CodeEdit/Features/ActivityViewer/Models/TaskNotificationModel.swift renamed to CodeEdit/Features/Activities/Models/CEActivity.swift

@@ -1,42 +1,42 @@
 //
-//  TaskNotificationView.swift
+//  ActivityView.swift
 //  CodeEdit
 //
 //  Created by Tommy Ludwig on 21.06.24.
 //
 
 import SwiftUI
 
-struct TaskNotificationView: View {
+struct ActivityView: View {
     @Environment(\.controlActiveState)
     private var activeState
 
-    @ObservedObject var taskNotificationHandler: TaskNotificationHandler
+    @ObservedObject var activityManager: ActivityManager
     @State private var isPresented: Bool = false
-    @State var notification: TaskNotificationModel?
+    @State var activity: CEActivity?
 
     var body: some View {
         ZStack {
-            if let notification {
+            if let activity {
                 HStack {
-                    Text(notification.title)
+                    Text(activity.title)
                         .font(.subheadline)
                         .transition(
                             .asymmetric(insertion: .move(edge: .top), removal: .move(edge: .bottom))
                             .combined(with: .opacity)
                         )
-                        .id("NotificationTitle" + notification.title)
+                        .id("ActivityTitle" + activity.title)
 
-                    if notification.isLoading {
+                    if activity.isLoading {
                         CECircularProgressView(
-                            progress: notification.percentage,
-                            currentTaskCount: taskNotificationHandler.notifications.count
+                            progress: activity.percentage,
+                            currentTaskCount: activityManager.activities.count
                         )
                         .padding(.horizontal, -1)
                         .frame(height: 16)
                     } else {
-                        if taskNotificationHandler.notifications.count > 1 {
-                            Text("\(taskNotificationHandler.notifications.count)")
+                        if activityManager.activities.count > 1 {
+                            Text("\(activityManager.activities.count)")
                                 .font(.caption)
                                 .padding(5)
                                 .background(
@@ -54,23 +54,23 @@ struct TaskNotificationView: View {
                 .padding(-3)
                 .padding(.trailing, 3)
                 .popover(isPresented: $isPresented, arrowEdge: .bottom) {
-                    TaskNotificationsDetailView(taskNotificationHandler: taskNotificationHandler)
+                    ActivitysDetailView(activityManager: activityManager)
                 }
                 .onTapGesture {
                     self.isPresented.toggle()
                 }
             }
         }
-        .animation(.easeInOut, value: notification)
-        .onChange(of: taskNotificationHandler.notifications) { newValue in
+        .animation(.easeInOut, value: activity)
+        .onChange(of: activityManager.activities) { newValue in
             withAnimation {
-                notification = newValue.first
+                activity = newValue.first
             }
         }
     }
 
 }
 
 #Preview {
-    TaskNotificationView(taskNotificationHandler: TaskNotificationHandler())
+    ActivityView(activityManager: ActivityManager())
 }

…asks/DropdownMenuItemStyleModifier.swift …iers/DropdownMenuItemStyleModifier.swiftCodeEdit/Features/ActivityViewer/Tasks/DropdownMenuItemStyleModifier.swift renamed to CodeEdit/Features/Activities/ViewModifiers/DropdownMenuItemStyleModifier.swift CodeEdit/Features/ActivityViewer/Tasks/DropdownMenuItemStyleModifier.swift renamed to CodeEdit/Features/Activities/ViewModifiers/DropdownMenuItemStyleModifier.swift

@@ -14,7 +14,7 @@ struct ActivityViewer: View {
 
     var workspaceFileManager: CEWorkspaceFileManager?
 
-    @ObservedObject var taskNotificationHandler: TaskNotificationHandler
+    @ObservedObject var activityManager: ActivityManager
     @ObservedObject var workspaceSettingsManager: CEWorkspaceSettings
 
     // TODO: try to get this from the envrionment
@@ -23,12 +23,12 @@ struct ActivityViewer: View {
     init(
         workspaceFileManager: CEWorkspaceFileManager?,
         workspaceSettingsManager: CEWorkspaceSettings,
-        taskNotificationHandler: TaskNotificationHandler,
+        activityManager: ActivityManager,
         taskManager: TaskManager
     ) {
         self.workspaceFileManager = workspaceFileManager
         self.workspaceSettingsManager = workspaceSettingsManager
-        self.taskNotificationHandler = taskNotificationHandler
+        self.activityManager = activityManager
         self.taskManager = taskManager
     }
     var body: some View {
@@ -42,7 +42,7 @@ struct ActivityViewer: View {
 
             Spacer(minLength: 0)
 
-            TaskNotificationView(taskNotificationHandler: taskNotificationHandler)
+            ActivityView(activityManager: activityManager)
                 .fixedSize()
         }
         .fixedSize(horizontal: false, vertical: false)