Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tasks and Activity Viewer UI Improvements #1831

Merged
merged 15 commits into from
Aug 6, 2024
Merged

Tasks and Activity Viewer UI Improvements #1831

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
54f417c
Made a few minor adjustments to the activity bar UI.
austincondiff Jul 30, 2024
c154dda
Cleaned up activity viewer menus
austincondiff Jul 31, 2024
446810b
Gave spacers a minLength
austincondiff Jul 31, 2024
2e0a704
Unified TaskView duplication. Refined workspace settings and add and …
austincondiff Jul 31, 2024
766bb81
Displaying workspace settings in a sheet instead of a window. Added m…
austincondiff Aug 1, 2024
ddedb93
Improved the activity viewer notification details popover design
austincondiff Aug 1, 2024
ad43937
Conditional display and animation of stop toolbar button
austincondiff Aug 2, 2024
e3eaae9
Added activity viewer notification animations.
austincondiff Aug 2, 2024
3a2f4f8
Fix Task Renew Race Condition, Stop Button Listeners
thecoolwinter Aug 3, 2024
1bf5a0c
Fixed SwiftLint error and reorganized Task folder structure
austincondiff Aug 3, 2024
0ee0759
Resolved PR issues. When running a task, the task output appears in t…
austincondiff Aug 4, 2024
6ef8036
Fixed SwiftLint errors
austincondiff Aug 4, 2024
2f008a4
PR issues
austincondiff Aug 4, 2024
3c4b9c2
Removed statusSubject and statusPublisher
austincondiff Aug 4, 2024
30dd961
Fixed bug where you could not rerun a task that was finished
austincondiff Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 41 additions & 13 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
617DB3D02C25AFAE00B58BFE /* TaskNotificationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617DB3CF2C25AFAE00B58BFE /* TaskNotificationHandler.swift */; };
617DB3D32C25AFEA00B58BFE /* TaskNotificationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617DB3D22C25AFEA00B58BFE /* TaskNotificationModel.swift */; };
617DB3D62C25B02D00B58BFE /* TaskNotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617DB3D52C25B02D00B58BFE /* TaskNotificationView.swift */; };
617DB3D82C25B04D00B58BFE /* CustomLoadingRingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617DB3D72C25B04D00B58BFE /* CustomLoadingRingView.swift */; };
617DB3D82C25B04D00B58BFE /* CECircularProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617DB3D72C25B04D00B58BFE /* CECircularProgressView.swift */; };
617DB3DA2C25B07F00B58BFE /* TaskNotificationsDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617DB3D92C25B07F00B58BFE /* TaskNotificationsDetailView.swift */; };
617DB3DC2C25B14A00B58BFE /* ActivityViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617DB3DB2C25B14A00B58BFE /* ActivityViewer.swift */; };
617DB3DF2C25E13800B58BFE /* TaskNotificationHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 617DB3DE2C25E13800B58BFE /* TaskNotificationHandlerTests.swift */; };
Expand All @@ -325,7 +325,6 @@
618725A62C29F02500987354 /* DropdownMenuItemStyleModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618725A52C29F02500987354 /* DropdownMenuItemStyleModifier.swift */; };
618725A82C29F05500987354 /* OptionMenuItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618725A72C29F05500987354 /* OptionMenuItemView.swift */; };
618725AB2C29F2C000987354 /* TaskDropDownView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618725AA2C29F2C000987354 /* TaskDropDownView.swift */; };
618725B02C2DBBE900987354 /* TaskSidebarTileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618725AF2C2DBBE900987354 /* TaskSidebarTileView.swift */; };
618725B22C2DBC0C00987354 /* TaskOutputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618725B12C2DBC0C00987354 /* TaskOutputView.swift */; };
618725B42C2DBC2800987354 /* TaskOutputActionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 618725B32C2DBC2800987354 /* TaskOutputActionsView.swift */; };
6195E30D2B64044F007261CA /* WorkspaceDocument+SearchState+FindTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6195E30C2B64044F007261CA /* WorkspaceDocument+SearchState+FindTests.swift */; };
Expand Down Expand Up @@ -531,6 +530,10 @@
B685DE7929CC9CCD002860C8 /* StatusBarIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = B685DE7829CC9CCD002860C8 /* StatusBarIcon.swift */; };
B697937A29FF5668002027EC /* AccountsSettingsAccountLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */; };
B69BFDC72B0686910050D9A6 /* GitClient+Initiate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */; };
B69D3EDE2C5E85A2005CF43A /* StopToolbarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69D3EDD2C5E85A2005CF43A /* StopToolbarButton.swift */; };
B69D3EE12C5F5357005CF43A /* TaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69D3EE02C5F5357005CF43A /* TaskView.swift */; };
B69D3EE32C5F536B005CF43A /* ActiveTaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69D3EE22C5F536B005CF43A /* ActiveTaskView.swift */; };
B69D3EE52C5F54B3005CF43A /* TasksPopoverMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69D3EE42C5F54B3005CF43A /* TasksPopoverMenuItem.swift */; };
B6A43C5D29FC4AF00027E0E0 /* CreateSSHKeyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A43C5C29FC4AF00027E0E0 /* CreateSSHKeyView.swift */; };
B6AB09A12AAABAAE0003A3A6 /* EditorTabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AB09A02AAABAAE0003A3A6 /* EditorTabs.swift */; };
B6AB09A32AAABFEC0003A3A6 /* EditorTabBarLeadingAccessories.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AB09A22AAABFEC0003A3A6 /* EditorTabBarLeadingAccessories.swift */; };
Expand Down Expand Up @@ -952,7 +955,7 @@
617DB3CF2C25AFAE00B58BFE /* TaskNotificationHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskNotificationHandler.swift; sourceTree = "<group>"; };
617DB3D22C25AFEA00B58BFE /* TaskNotificationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskNotificationModel.swift; sourceTree = "<group>"; };
617DB3D52C25B02D00B58BFE /* TaskNotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskNotificationView.swift; sourceTree = "<group>"; };
617DB3D72C25B04D00B58BFE /* CustomLoadingRingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomLoadingRingView.swift; sourceTree = "<group>"; };
617DB3D72C25B04D00B58BFE /* CECircularProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CECircularProgressView.swift; sourceTree = "<group>"; };
617DB3D92C25B07F00B58BFE /* TaskNotificationsDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskNotificationsDetailView.swift; sourceTree = "<group>"; };
617DB3DB2C25B14A00B58BFE /* ActivityViewer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityViewer.swift; sourceTree = "<group>"; };
617DB3DE2C25E13800B58BFE /* TaskNotificationHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskNotificationHandlerTests.swift; sourceTree = "<group>"; };
Expand All @@ -961,7 +964,6 @@
618725A52C29F02500987354 /* DropdownMenuItemStyleModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropdownMenuItemStyleModifier.swift; sourceTree = "<group>"; };
618725A72C29F05500987354 /* OptionMenuItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionMenuItemView.swift; sourceTree = "<group>"; };
618725AA2C29F2C000987354 /* TaskDropDownView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskDropDownView.swift; sourceTree = "<group>"; };
618725AF2C2DBBE900987354 /* TaskSidebarTileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskSidebarTileView.swift; sourceTree = "<group>"; };
618725B12C2DBC0C00987354 /* TaskOutputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskOutputView.swift; sourceTree = "<group>"; };
618725B32C2DBC2800987354 /* TaskOutputActionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskOutputActionsView.swift; sourceTree = "<group>"; };
6195E30C2B64044F007261CA /* WorkspaceDocument+SearchState+FindTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorkspaceDocument+SearchState+FindTests.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1161,6 +1163,10 @@
B685DE7829CC9CCD002860C8 /* StatusBarIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBarIcon.swift; sourceTree = "<group>"; };
B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsAccountLink.swift; sourceTree = "<group>"; };
B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Initiate.swift"; sourceTree = "<group>"; };
B69D3EDD2C5E85A2005CF43A /* StopToolbarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopToolbarButton.swift; sourceTree = "<group>"; };
B69D3EE02C5F5357005CF43A /* TaskView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskView.swift; sourceTree = "<group>"; };
B69D3EE22C5F536B005CF43A /* ActiveTaskView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveTaskView.swift; sourceTree = "<group>"; };
B69D3EE42C5F54B3005CF43A /* TasksPopoverMenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TasksPopoverMenuItem.swift; sourceTree = "<group>"; };
B6A43C5C29FC4AF00027E0E0 /* CreateSSHKeyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSSHKeyView.swift; sourceTree = "<group>"; };
B6AB09A02AAABAAE0003A3A6 /* EditorTabs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorTabs.swift; sourceTree = "<group>"; };
B6AB09A22AAABFEC0003A3A6 /* EditorTabBarLeadingAccessories.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorTabBarLeadingAccessories.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2558,7 +2564,7 @@
children = (
617DB3DB2C25B14A00B58BFE /* ActivityViewer.swift */,
618725A22C29EFE200987354 /* Tasks */,
618725A92C29F09900987354 /* Notificaitons */,
618725A92C29F09900987354 /* Notifications */,
617DB3D12C25AFD300B58BFE /* Models */,
);
path = ActivityViewer;
Expand All @@ -2585,22 +2591,25 @@
children = (
618725A02C29EFCC00987354 /* SchemeDropDownView.swift */,
618725AA2C29F2C000987354 /* TaskDropDownView.swift */,
B69D3EE02C5F5357005CF43A /* TaskView.swift */,
B69D3EE22C5F536B005CF43A /* ActiveTaskView.swift */,
B69D3EE42C5F54B3005CF43A /* TasksPopoverMenuItem.swift */,
618725A32C29F00400987354 /* WorkspaceMenuItemView.swift */,
618725A72C29F05500987354 /* OptionMenuItemView.swift */,
618725A52C29F02500987354 /* DropdownMenuItemStyleModifier.swift */,
);
path = Tasks;
sourceTree = "<group>";
};
618725A92C29F09900987354 /* Notificaitons */ = {
618725A92C29F09900987354 /* Notifications */ = {
isa = PBXGroup;
children = (
617DB3D52C25B02D00B58BFE /* TaskNotificationView.swift */,
617DB3D92C25B07F00B58BFE /* TaskNotificationsDetailView.swift */,
617DB3D72C25B04D00B58BFE /* CustomLoadingRingView.swift */,
617DB3D72C25B04D00B58BFE /* CECircularProgressView.swift */,
617DB3CF2C25AFAE00B58BFE /* TaskNotificationHandler.swift */,
);
path = Notificaitons;
path = Notifications;
sourceTree = "<group>";
};
618725B92C33107C00987354 /* CEWorkspaceSettings */ = {
Expand Down Expand Up @@ -2640,9 +2649,9 @@
61D435C52C29684100D032B8 /* Tasks */ = {
isa = PBXGroup;
children = (
B69D3EDF2C5E85B8005CF43A /* Models */,
B69D3EDC2C5E856F005CF43A /* Views */,
61D435CB2C29699800D032B8 /* TaskManager.swift */,
61D435CD2C2969C300D032B8 /* CEActiveTask.swift */,
61D435D12C2969D800D032B8 /* CETaskStatus.swift */,
);
path = Tasks;
sourceTree = "<group>";
Expand Down Expand Up @@ -3224,7 +3233,6 @@
children = (
B62AEDB42A1FE295009A9F52 /* UtilityAreaDebugView.swift */,
618725B32C2DBC2800987354 /* TaskOutputActionsView.swift */,
618725AF2C2DBBE900987354 /* TaskSidebarTileView.swift */,
618725B12C2DBC0C00987354 /* TaskOutputView.swift */,
);
path = DebugUtility;
Expand Down Expand Up @@ -3259,6 +3267,23 @@
path = Settings;
sourceTree = "<group>";
};
B69D3EDC2C5E856F005CF43A /* Views */ = {
isa = PBXGroup;
children = (
B69D3EDD2C5E85A2005CF43A /* StopToolbarButton.swift */,
);
path = Views;
sourceTree = "<group>";
};
B69D3EDF2C5E85B8005CF43A /* Models */ = {
isa = PBXGroup;
children = (
61D435CD2C2969C300D032B8 /* CEActiveTask.swift */,
61D435D12C2969D800D032B8 /* CETaskStatus.swift */,
);
path = Models;
sourceTree = "<group>";
};
B6AB09AB2AAACBF70003A3A6 /* Tabs */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3853,7 +3878,7 @@
B6C4F2AC2B3CC4D000B2B140 /* CommitChangedFileListItemView.swift in Sources */,
61A3E3E12C331B4A00076BD3 /* AddCETaskView.swift in Sources */,
6C82D6B329BFD88700495C54 /* NavigateCommands.swift in Sources */,
617DB3D82C25B04D00B58BFE /* CustomLoadingRingView.swift in Sources */,
617DB3D82C25B04D00B58BFE /* CECircularProgressView.swift in Sources */,
B6CFD8112C20A8EE00E63F1A /* NSFont+WithWeight.swift in Sources */,
B66A4E4C29C9179B004573B4 /* CodeEditApp.swift in Sources */,
661EF7B82BEE215300C3E577 /* ImageFileView.swift in Sources */,
Expand Down Expand Up @@ -3948,6 +3973,7 @@
6CC17B512C43311900834E2C /* ProjectNavigatorViewController+NSOutlineViewDataSource.swift in Sources */,
587B9E6429301D8F00AC7927 /* GitLabCommit.swift in Sources */,
B6E55C3B2A95368E003ECC7D /* EditorTabsOverflowShadow.swift in Sources */,
B69D3EE12C5F5357005CF43A /* TaskView.swift in Sources */,
58A5DFA229339F6400D1BD5D /* KeybindingManager.swift in Sources */,
B62AEDB32A1FD95B009A9F52 /* UtilityAreaTerminalView.swift in Sources */,
661EF7BD2BEE215300C3E577 /* LoadingFileView.swift in Sources */,
Expand Down Expand Up @@ -3997,6 +4023,7 @@
587B9E6329301D8F00AC7927 /* GitLabAccount.swift in Sources */,
6C1CC99B2B1E7CBC0002349B /* FindNavigatorIndexBar.swift in Sources */,
285FEC7027FE4B9800E57D53 /* ProjectNavigatorTableViewCell.swift in Sources */,
B69D3EE32C5F536B005CF43A /* ActiveTaskView.swift in Sources */,
300051672BBD3A5D00A98562 /* ServiceContainer.swift in Sources */,
6CB9144B29BEC7F100BC47F2 /* (null) in Sources */,
587B9E7429301D8F00AC7927 /* URL+URLParameters.swift in Sources */,
Expand Down Expand Up @@ -4044,6 +4071,7 @@
587B9E9929301D8F00AC7927 /* GitChangedFile.swift in Sources */,
6C147C4B29A32A7B0089B630 /* Environment+SplitEditor.swift in Sources */,
2897E1C72979A29200741E32 /* TrackableScrollView.swift in Sources */,
B69D3EDE2C5E85A2005CF43A /* StopToolbarButton.swift in Sources */,
58F2EB0E292FB2B0004A9BDE /* SoftwareUpdater.swift in Sources */,
587B9E9529301D8F00AC7927 /* BitBucketUser.swift in Sources */,
587B9E7C29301D8F00AC7927 /* GitHubRepositoryRouter.swift in Sources */,
Expand All @@ -4067,7 +4095,6 @@
587B9DA629300ABD00AC7927 /* ToolbarBranchPicker.swift in Sources */,
6C6BD6F629CD145F00235D17 /* ExtensionInfo.swift in Sources */,
04BA7C202AE2D92B00584E1C /* GitClient+Status.swift in Sources */,
618725B02C2DBBE900987354 /* TaskSidebarTileView.swift in Sources */,
58F2EB05292FB2B0004A9BDE /* Settings.swift in Sources */,
6CBD1BC62978DE53006639D5 /* Font+Caption3.swift in Sources */,
30E6D0012A6E505200A58B20 /* NavigatorSidebarViewModel.swift in Sources */,
Expand Down Expand Up @@ -4201,6 +4228,7 @@
611192002B08CCD700D4459B /* SearchIndexer+Memory.swift in Sources */,
587B9E8129301D8F00AC7927 /* PublicKey.swift in Sources */,
611191FE2B08CCD200D4459B /* SearchIndexer+File.swift in Sources */,
B69D3EE52C5F54B3005CF43A /* TasksPopoverMenuItem.swift in Sources */,
669A50532C380C8E00304CD8 /* Collection+subscript_safe.swift in Sources */,
5B241BF32B6DDBFF0016E616 /* IgnorePatternListItemView.swift in Sources */,
6CB52DC92AC8DC3E002E75B3 /* CEWorkspaceFileManager+FileManagement.swift in Sources */,
Expand Down
7 changes: 5 additions & 2 deletions CodeEdit/Features/ActivityViewer/ActivityViewer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,14 @@ struct ActivityViewer: View {
.fixedSize()
}
.fixedSize(horizontal: false, vertical: false)
.padding(.horizontal, 10)
.padding(.horizontal, 5)
.padding(.vertical, 1.5)
.frame(height: 22)
.clipped()
.background {
if colorScheme == .dark {
RoundedRectangle(cornerRadius: 5)
.opacity(0.10)
.opacity(0.1)
} else {
RoundedRectangle(cornerRadius: 5)
.opacity(0.1)
Expand Down
66 changes: 0 additions & 66 deletions CodeEdit/Features/ActivityViewer/Notificaitons/TaskNotificationView.swift
View file
Open in desktop

This file was deleted.

Loading
Loading