Adjust Task Notification View

Author: thecoolwinter

CodeEdit/Features/ActivityViewer/ActivityViewer.swift

@@ -37,6 +37,12 @@ struct ActivityViewer: View {
                 content
                     .fixedSize(horizontal: false, vertical: false)
                     .padding(.horizontal, 4)
+                // TaskNotificationView doesn't have it's own padding
+                // Also this padding seems weird. However, we want the spinning circle to be padded with the same
+                // amount from both the top and bottom, as well as the trailing edge. So despite it not being exactly
+                // the same it *looks* correctly padded
+                    .padding(.trailing, 8)
+                    .clipShape(Capsule())
             } else {
                 content
                     .fixedSize(horizontal: false, vertical: false)

CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift

@@ -17,48 +17,35 @@ struct TaskNotificationView: View {
 
     var body: some View {
         ZStack {
-            if let notification {
-                HStack {
-                    Text(notification.title)
-                        .font(.subheadline)
-                        .transition(
-                            .asymmetric(insertion: .move(edge: .top), removal: .move(edge: .bottom))
-                            .combined(with: .opacity)
-                        )
-                        .id("NotificationTitle" + notification.title)
-
-                    if notification.isLoading {
-                        CECircularProgressView(
-                            progress: notification.percentage,
-                            currentTaskCount: taskNotificationHandler.notifications.count
-                        )
-                        .padding(.horizontal, -1)
-                        .frame(height: 16)
-                    } else {
-                        if taskNotificationHandler.notifications.count > 1 {
-                            Text("\(taskNotificationHandler.notifications.count)")
-                                .font(.caption)
-                                .padding(5)
-                                .background(
-                                    Circle()
-                                        .foregroundStyle(.gray)
-                                        .opacity(0.2)
-                                )
-                                .padding(-5)
-                        }
+            HStack {
+                if let notification {
+                    HStack {
+                        Text(notification.title)
+                            .font(.subheadline)
+                            .transition(
+                                .asymmetric(insertion: .move(edge: .top), removal: .move(edge: .bottom))
+                                .combined(with: .opacity)
+                            )
+                            .id("NotificationTitle" + notification.title)
                     }
+                    .transition(.opacity.combined(with: .move(edge: .trailing)))
+
+                    loaderView(notification: notification)
+                        .transition(.opacity)
+                        .id("Loader")
+                } else {
+                    Text("")
+                        .id("Loader")
                 }
-                .transition(.opacity.combined(with: .move(edge: .trailing)))
-                .opacity(activeState == .inactive ? 0.4 : 1.0)
-                .padding(3)
-                .padding(-3)
-                .padding(.trailing, 3)
-                .popover(isPresented: $isPresented, arrowEdge: .bottom) {
-                    TaskNotificationsDetailView(taskNotificationHandler: taskNotificationHandler)
-                }
-                .onTapGesture {
-                    self.isPresented.toggle()
-                }
+            }
+            .opacity(activeState == .inactive ? 0.4 : 1.0)
+            .padding(3)
+            .padding(-3)
+            .popover(isPresented: $isPresented, arrowEdge: .bottom) {
+                TaskNotificationsDetailView(taskNotificationHandler: taskNotificationHandler)
+            }
+            .onTapGesture {
+                self.isPresented.toggle()
             }
         }
         .animation(.easeInOut, value: notification)
@@ -69,6 +56,29 @@ struct TaskNotificationView: View {
         }
     }
 
+    @ViewBuilder
+    private func loaderView(notification: TaskNotificationModel) -> some View {
+        if notification.isLoading {
+            CECircularProgressView(
+                progress: notification.percentage,
+                currentTaskCount: taskNotificationHandler.notifications.count
+            )
+            .padding(.horizontal, -1)
+            .frame(height: 16)
+        } else {
+            if taskNotificationHandler.notifications.count > 1 {
+                Text("\(taskNotificationHandler.notifications.count)")
+                    .font(.caption)
+                    .padding(5)
+                    .background(
+                        Circle()
+                            .foregroundStyle(.gray)
+                            .opacity(0.2)
+                    )
+                    .padding(-5)
+            }
+        }
+    }
 }
 
 #Preview {

CodeEdit/Features/ActivityViewer/Tasks/SchemeDropDownView.swift

@@ -80,7 +80,7 @@ struct SchemeDropDownView: View {
         .background {
             Color(nsColor: colorScheme == .dark ? .white : .black)
                 .opacity(isHoveringScheme || isSchemePopOverPresented ? 0.05 : 0)
-                .clipShape(Capsule(style: .continuous))
+                .clipShape(Capsule())
         }
     }
 

CodeEdit/Features/ActivityViewer/Tasks/TaskDropDownView.swift

@@ -58,7 +58,7 @@ struct TaskDropDownView: View {
         .background {
             Color(nsColor: colorScheme == .dark ? .white : .black)
                 .opacity(isHoveringTasks || isTaskPopOverPresented ? 0.05 : 0)
-                .clipShape(Capsule(style: .continuous))
+                .clipShape(Capsule())
         }
     }