Run Tasks

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "f3dd40f19b32a2b522dee7a1e94ceb60afbdb1a028938883adffc7328ef9d804",
+  "originHash" : "a33fcca819dee4c816b1474e19017510b1d62b170c921187042e0675d3f4b0b3",
   "pins" : [
     {
       "identity" : "anycodable",
@@ -13,7 +13,7 @@
     {
       "identity" : "codeeditkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/CodeEditApp/CodeEditKit.git",
+      "location" : "https://github.com/CodeEditApp/CodeEditKit",
       "state" : {
         "revision" : "ad28213a968586abb0cb21a8a56a3587227895f1",
         "version" : "0.1.2"
@@ -31,7 +31,7 @@
     {
       "identity" : "codeeditsourceeditor",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/CodeEditApp/CodeEditSourceEditor.git",
+      "location" : "https://github.com/CodeEditApp/CodeEditSourceEditor",
       "state" : {
         "revision" : "cf85789d527d569e94edfd674c5ac8071b244dd9",
         "version" : "0.7.3"

CodeEdit/Features/ActivityViewer/ActivityViewer.swift

@@ -12,15 +12,33 @@ struct ActivityViewer: View {
     @Environment(\.colorScheme)
     var colorScheme
 
+    var workspaceFileManager: CEWorkspaceFileManager?
+
     @ObservedObject var taskNotificationHandler: TaskNotificationHandler
+    @ObservedObject var workspaceSettingsManager: CEWorkspaceSettingsManager
+
+    // TODO: try to get this from the envrionment
+    @ObservedObject var taskManager: TaskManager
 
+    init(
+        workspaceFileManager: CEWorkspaceFileManager?,
+        workspaceSettingsManager: CEWorkspaceSettingsManager,
+        taskNotificationHandler: TaskNotificationHandler,
+        taskManager: TaskManager
+    ) {
+        self.workspaceFileManager = workspaceFileManager
+        self.workspaceSettingsManager = workspaceSettingsManager
+        self.taskNotificationHandler = taskNotificationHandler
+        self.taskManager = taskManager
+    }
     var body: some View {
         HStack(spacing: 0) {
-            // This is only a placeholder for the task popover(coming in the next pr)
-            Rectangle()
-                .frame(height: 22)
-                .hidden()
-                .fixedSize()
+            SchemeDropDownView(
+                workspaceSettingsManager: workspaceSettingsManager,
+                workspaceFileManager: workspaceFileManager
+            )
+
+            TaskDropDownView(taskManager: taskManager)
 
             Spacer(minLength: 0)
 
@@ -30,8 +48,13 @@ struct ActivityViewer: View {
         .fixedSize(horizontal: false, vertical: false)
         .padding(.horizontal, 10)
         .background {
-            RoundedRectangle(cornerRadius: 5)
-                .opacity(0.1)
+            if colorScheme == .dark {
+                RoundedRectangle(cornerRadius: 5)
+                    .opacity(0.10)
+            } else {
+                RoundedRectangle(cornerRadius: 5)
+                    .opacity(0.1)
+            }
         }
     }
 }

CodeEdit/Features/ActivityViewer/TaskNotificationView.swift → CodeEdit/Features/ActivityViewer/Notificaitons/TaskNotificationView.swift

@@ -28,10 +28,14 @@ struct TaskNotificationView: View {
                 } else {
                     if taskNotificationHandler.notifications.count > 1 {
                         Text("\(taskNotificationHandler.notifications.count)")
+                            .font(.caption)
+                            .padding(5)
                             .background(
                                 Circle()
                                     .foregroundStyle(.gray)
+                                    .opacity(0.3)
                             )
+                            .padding(-5)
                     }
                 }
             }

CodeEdit/Features/ActivityViewer/Tasks/DropdownMenuItemStyleModifier.swift

@@ -0,0 +1,21 @@
+//
+//  DropdownMenuItemStyleModifier.swift
+//  CodeEdit
+//
+//  Created by Tommy Ludwig on 24.06.24.
+//
+
+import SwiftUI
+
+struct DropdownMenuItemStyleModifier: ViewModifier {
+    @State private var isHovering = false
+
+    func body(content: Content) -> some View {
+        content
+            .background(isHovering ? Color(NSColor.systemBlue) : .clear)
+            .foregroundColor(isHovering ? Color(NSColor.white) : .primary)
+            .onHover(perform: { hovering in
+                self.isHovering = hovering
+            })
+    }
+}

CodeEdit/Features/ActivityViewer/Tasks/OptionMenuItemView.swift

@@ -0,0 +1,32 @@
+//
+//  OptionMenuItemView.swift
+//  CodeEdit
+//
+//  Created by Tommy Ludwig on 24.06.24.
+//
+
+import SwiftUI
+
+struct OptionMenuItemView: View {
+    var label: String
+    var action: () -> Void
+    var body: some View {
+        HStack {
+            Text(label)
+            Spacer()
+        }
+        .padding(.vertical, 5)
+        .padding(.horizontal, 28)
+        .modifier(DropdownMenuItemStyleModifier())
+        .clipShape(RoundedRectangle(cornerRadius: 5))
+        .onTapGesture {
+            action()
+        }
+    }
+}
+
+#Preview {
+    OptionMenuItemView(label: "Tst") {
+        print("test")
+    }
+}

CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift

@@ -0,0 +1,100 @@
+//
+//  SchemeDropDownView.swift
+//  CodeEdit
+//
+//  Created by Tommy Ludwig on 24.06.24.
+//
+
+import SwiftUI
+
+struct SchemeDropDownView: View {
+    @Environment(\.colorScheme)
+    private var colorScheme
+
+    @State var isSchemePopOverPresented: Bool = false
+    @State private var isHoveringScheme: Bool = false
+
+    @ObservedObject var workspaceSettingsManager: CEWorkspaceSettingsManager
+    var workspaceFileManager: CEWorkspaceFileManager?
+
+    var body: some View {
+        HStack(spacing: 5) {
+            Image(systemName: "folder.badge.gearshape")
+                .imageScale(.medium)
+
+            Group {
+                if workspaceSettingsManager.settings.project.projectName.isEmpty {
+                    Text(workspaceFileManager?.workspaceItem.fileName() ?? "No Project found")
+                } else {
+                    Text(workspaceSettingsManager.settings.project.projectName)
+                }
+            }.font(.subheadline)
+        }
+        .font(.caption)
+        .padding(.trailing, 9)
+        .padding(5)
+        .background {
+            Color(nsColor: colorScheme == .dark ? .white : .black)
+                .opacity(isHoveringScheme || isSchemePopOverPresented ? 0.05 : 0)
+                .clipShape(RoundedRectangle(cornerSize: CGSize(width: 4, height: 4)))
+            HStack {
+                Spacer()
+                if isHoveringScheme || isSchemePopOverPresented {
+                    chevronDown
+                        .padding(.trailing, 3)
+                } else {
+                    chevron
+                        .padding(.trailing, 3)
+                }
+            }
+        }
+        .onHover(perform: { hovering in
+            self.isHoveringScheme = hovering
+        })
+        .popover(isPresented: $isSchemePopOverPresented, arrowEdge: .bottom) {
+            VStack(alignment: .leading, spacing: 0) {
+                WorkspaceMenuItemView(
+                    workspaceFileManager: workspaceFileManager,
+                    item: workspaceFileManager?.workspaceItem
+                )
+
+                Divider()
+                    .padding(.vertical, 5)
+                Group {
+                    OptionMenuItemView(label: "Add Folder..") {
+                        // TODO: Implment Add Folder
+                        print("NOT IMPLMENTED")
+                    }
+                    OptionMenuItemView(label: "Workspace Settings...") {
+                        NSApp.sendAction(
+                            #selector(CodeEditWindowController.openWorkspaceSettings(_:)), to: nil, from: nil
+                        )
+                    }
+                }
+            }
+            .padding(5)
+        }.onTapGesture {
+            self.isSchemePopOverPresented.toggle()
+        }
+    }
+
+    private var chevron: some View {
+        Image(systemName: "chevron.compact.right")
+            .font(.system(size: 9, weight: .medium, design: .default))
+            .foregroundStyle(.secondary)
+            .scaleEffect(x: 1.30, y: 1.0, anchor: .center)
+            .imageScale(.large)
+    }
+
+    private var chevronDown: some View {
+        VStack(spacing: 1) {
+            Image(systemName: "chevron.down")
+        }
+        .font(.system(size: 8, weight: .bold, design: .default))
+        .padding(.top, 0.5)
+    }
+}
+
+// #Preview {
+//    SchemeDropDownMenuView()
+// }