Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5aac83d
Added global notifications system
austincondiff Feb 11, 2025
779e3a6
Refactored FeatureIcon and notifications to support custom images
austincondiff Feb 11, 2025
6988330
Fixed SwiftLint errors
austincondiff Feb 11, 2025
9b524bd
Fixed SwiftLint errors
austincondiff Feb 12, 2025
99041cf
Deleted unused file
austincondiff Feb 12, 2025
13d3bca
Added sticky notifications. Allowed multiple notifications to overlay…
austincondiff Feb 12, 2025
2471175
Streamlined UI getting rid of the notifications popover in favor of t…
austincondiff Feb 13, 2025
b91877e
Added a close button click state, allows clicking under scroll view.
austincondiff Feb 14, 2025
d3d26d1
Fix SwiftLint errors by splitting up NotificationManager
austincondiff Feb 14, 2025
a4846e9
Fixed SwiftLint errors
austincondiff Feb 15, 2025
8349007
Remove test notification
austincondiff Feb 15, 2025
85f4656
Improve notification handling and workspace panel behavior
austincondiff Feb 18, 2025
721389c
Fixed SwiftLint and PR issues
austincondiff Feb 18, 2025
b839c1a
Added an Internal Development Inspector for debug purposes. This insp…
austincondiff Feb 18, 2025
c292c7d
Fixed animation glitch when taking action on a notification while not…
austincondiff Feb 19, 2025
cd1bf2d
Changed variable name isManuallyShown to isPresented, and notificatio…
austincondiff Feb 19, 2025
d2060e7
SwiftLint error fix
austincondiff Feb 19, 2025
dc33a4e
SwiftLint fixes
austincondiff Feb 19, 2025
4815194
Refactored CENotification to use delegated inits.
austincondiff Feb 19, 2025
749c716
Moved CloseButtonStyle into CodeEditUI and renamed it OverlayButtonStyle
austincondiff Feb 20, 2025
5e6c608
Using cancelables so workspace cleanup is more concise
austincondiff Feb 20, 2025
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: 53 additions & 1 deletion CodeEdit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,8 @@
B65B10FE2B08B07D002852CF /* SourceControlNavigatorChangesList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65B10FD2B08B07D002852CF /* SourceControlNavigatorChangesList.swift */; };
B65B11012B09D5D4002852CF /* GitClient+Pull.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65B11002B09D5D4002852CF /* GitClient+Pull.swift */; };
B65B11042B09DB1C002852CF /* GitClient+Fetch.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65B11032B09DB1C002852CF /* GitClient+Fetch.swift */; };
B66460592D600E9500EC1411 /* NotificationManager+Delegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66460572D600E9500EC1411 /* NotificationManager+Delegate.swift */; };
B664605A2D600E9500EC1411 /* NotificationManager+System.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66460582D600E9500EC1411 /* NotificationManager+System.swift */; };
B664C3B02B965F6C00816B4E /* NavigationSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B664C3AF2B965F6C00816B4E /* NavigationSettings.swift */; };
B664C3B32B96634F00816B4E /* NavigationSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B664C3B22B96634F00816B4E /* NavigationSettingsView.swift */; };
B66A4E4529C8E86D004573B4 /* CommandsFixes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66A4E4429C8E86D004573B4 /* CommandsFixes.swift */; };
Expand All @@ -580,6 +582,11 @@
B67DBB942CD5FC08007F4F18 /* GlobPatternListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B67DBB932CD5FBE2007F4F18 /* GlobPatternListItem.swift */; };
B68108042C60287F008B27C1 /* StartTaskToolbarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68108032C60287F008B27C1 /* StartTaskToolbarButton.swift */; };
B685DE7929CC9CCD002860C8 /* StatusBarIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = B685DE7829CC9CCD002860C8 /* StatusBarIcon.swift */; };
B68DE5DF2D5A61E5009A43EF /* CENotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68DE5D72D5A61E5009A43EF /* CENotification.swift */; };
B68DE5E02D5A61E5009A43EF /* NotificationBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68DE5D92D5A61E5009A43EF /* NotificationBannerView.swift */; };
B68DE5E22D5A61E5009A43EF /* NotificationToolbarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68DE5DB2D5A61E5009A43EF /* NotificationToolbarItem.swift */; };
B68DE5E32D5A61E5009A43EF /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68DE5DD2D5A61E5009A43EF /* NotificationManager.swift */; };
B68DE5E52D5A7988009A43EF /* NotificationOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68DE5E42D5A7988009A43EF /* NotificationOverlayView.swift */; };
B6966A282C2F683300259C2D /* SourceControlPullView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6966A272C2F683300259C2D /* SourceControlPullView.swift */; };
B6966A2A2C2F687A00259C2D /* SourceControlFetchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6966A292C2F687A00259C2D /* SourceControlFetchView.swift */; };
B6966A2E2C3056AD00259C2D /* SourceControlCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6966A2D2C3056AD00259C2D /* SourceControlCommands.swift */; };
Expand Down Expand Up @@ -1248,6 +1255,8 @@
B65B10FD2B08B07D002852CF /* SourceControlNavigatorChangesList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorChangesList.swift; sourceTree = "<group>"; };
B65B11002B09D5D4002852CF /* GitClient+Pull.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Pull.swift"; sourceTree = "<group>"; };
B65B11032B09DB1C002852CF /* GitClient+Fetch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Fetch.swift"; sourceTree = "<group>"; };
B66460572D600E9500EC1411 /* NotificationManager+Delegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NotificationManager+Delegate.swift"; sourceTree = "<group>"; };
B66460582D600E9500EC1411 /* NotificationManager+System.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NotificationManager+System.swift"; sourceTree = "<group>"; };
B664C3AF2B965F6C00816B4E /* NavigationSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationSettings.swift; sourceTree = "<group>"; };
B664C3B22B96634F00816B4E /* NavigationSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationSettingsView.swift; sourceTree = "<group>"; };
B66A4E4429C8E86D004573B4 /* CommandsFixes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandsFixes.swift; sourceTree = "<group>"; };
Expand All @@ -1270,6 +1279,11 @@
B67DBB932CD5FBE2007F4F18 /* GlobPatternListItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobPatternListItem.swift; sourceTree = "<group>"; };
B68108032C60287F008B27C1 /* StartTaskToolbarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartTaskToolbarButton.swift; sourceTree = "<group>"; };
B685DE7829CC9CCD002860C8 /* StatusBarIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBarIcon.swift; sourceTree = "<group>"; };
B68DE5D72D5A61E5009A43EF /* CENotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CENotification.swift; sourceTree = "<group>"; };
B68DE5D92D5A61E5009A43EF /* NotificationBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationBannerView.swift; sourceTree = "<group>"; };
B68DE5DB2D5A61E5009A43EF /* NotificationToolbarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationToolbarItem.swift; sourceTree = "<group>"; };
B68DE5DD2D5A61E5009A43EF /* NotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = "<group>"; };
B68DE5E42D5A7988009A43EF /* NotificationOverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationOverlayView.swift; sourceTree = "<group>"; };
B6966A272C2F683300259C2D /* SourceControlPullView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlPullView.swift; sourceTree = "<group>"; };
B6966A292C2F687A00259C2D /* SourceControlFetchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlFetchView.swift; sourceTree = "<group>"; };
B6966A2D2C3056AD00259C2D /* SourceControlCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlCommands.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1761,6 +1775,7 @@
58A5DF9D29339F6400D1BD5D /* Keybindings */,
30B087FB2C0D53080063A882 /* LSP */,
287776EA27E350A100D46668 /* NavigatorArea */,
B68DE5DE2D5A61E5009A43EF /* Notifications */,
5878DAA0291AE76700DD95A3 /* OpenQuickly */,
58798210292D92370085B254 /* Search */,
B67B270029D7868000FB9301 /* Settings */,
Expand Down Expand Up @@ -2130,6 +2145,7 @@
587B9D8F29300ABD00AC7927 /* ToolbarBranchPicker.swift */,
B6DCDAC52CCDE2B90099FBF9 /* InstantPopoverModifier.swift */,
2897E1C62979A29200741E32 /* TrackableScrollView.swift */,
B696A7E52CFE20C40048CFE1 /* FeatureIcon.swift */,
B60718302B15A9A3009CDAB4 /* CEOutlineGroup.swift */,
);
path = Views;
Expand Down Expand Up @@ -3547,6 +3563,36 @@
path = Settings;
sourceTree = "<group>";
};
B68DE5D82D5A61E5009A43EF /* Models */ = {
isa = PBXGroup;
children = (
B68DE5D72D5A61E5009A43EF /* CENotification.swift */,
);
path = Models;
sourceTree = "<group>";
};
B68DE5DC2D5A61E5009A43EF /* Views */ = {
isa = PBXGroup;
children = (
B68DE5D92D5A61E5009A43EF /* NotificationBannerView.swift */,
B68DE5DB2D5A61E5009A43EF /* NotificationToolbarItem.swift */,
B68DE5E42D5A7988009A43EF /* NotificationOverlayView.swift */,
);
path = Views;
sourceTree = "<group>";
};
B68DE5DE2D5A61E5009A43EF /* Notifications */ = {
isa = PBXGroup;
children = (
B68DE5D82D5A61E5009A43EF /* Models */,
B68DE5DC2D5A61E5009A43EF /* Views */,
B68DE5DD2D5A61E5009A43EF /* NotificationManager.swift */,
B66460572D600E9500EC1411 /* NotificationManager+Delegate.swift */,
B66460582D600E9500EC1411 /* NotificationManager+System.swift */,
);
path = Notifications;
sourceTree = "<group>";
};
B6966A262C2F673A00259C2D /* Views */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3643,7 +3689,6 @@
B6CF632A29E5436C0085880A /* Views */ = {
isa = PBXGroup;
children = (
B696A7E52CFE20C40048CFE1 /* FeatureIcon.swift */,
B67DBB932CD5FBE2007F4F18 /* GlobPatternListItem.swift */,
B67DBB912CD5EAA4007F4F18 /* GlobPatternList.swift */,
B6041F4C29D7A4E9000F3454 /* SettingsPageView.swift */,
Expand Down Expand Up @@ -4065,6 +4110,10 @@
B6BF41422C2C672A003AB4B3 /* SourceControlPushView.swift in Sources */,
587B9E8429301D8F00AC7927 /* GitHubUser.swift in Sources */,
04BA7C1C2AE2D84100584E1C /* GitClient+Commit.swift in Sources */,
B68DE5DF2D5A61E5009A43EF /* CENotification.swift in Sources */,
B68DE5E02D5A61E5009A43EF /* NotificationBannerView.swift in Sources */,
B68DE5E22D5A61E5009A43EF /* NotificationToolbarItem.swift in Sources */,
B68DE5E32D5A61E5009A43EF /* NotificationManager.swift in Sources */,
B65B10EC2B073913002852CF /* CEContentUnavailableView.swift in Sources */,
5B698A0A2B262FA000DE9392 /* SearchSettingsView.swift in Sources */,
B65B10FB2B08B054002852CF /* Divided.swift in Sources */,
Expand Down Expand Up @@ -4183,6 +4232,7 @@
B6B2D7A12CE8797B00379967 /* GitConfigExtensions.swift in Sources */,
587B9E7329301D8F00AC7927 /* GitRouter.swift in Sources */,
6C2C156129B4F52F00EA60A5 /* SplitViewModifiers.swift in Sources */,
B68DE5E52D5A7988009A43EF /* NotificationOverlayView.swift in Sources */,
61A53A812B4449F00093BF8A /* WorkspaceDocument+Index.swift in Sources */,
66AF6CE22BF17CC300D83C9D /* StatusBarViewModel.swift in Sources */,
30CB648D2C12680F00CC8A9E /* LSPService+Events.swift in Sources */,
Expand Down Expand Up @@ -4481,6 +4531,8 @@
B6A43C5D29FC4AF00027E0E0 /* CreateSSHKeyView.swift in Sources */,
B6EA200229DB7F81001BF195 /* View+ConstrainHeightToWindow.swift in Sources */,
66F370342BEE537B00D3B823 /* NonTextFileView.swift in Sources */,
B66460592D600E9500EC1411 /* NotificationManager+Delegate.swift in Sources */,
B664605A2D600E9500EC1411 /* NotificationManager+System.swift in Sources */,
613899B72B6E702F00A5CAF6 /* String+LengthOfMatchingPrefix.swift in Sources */,
6C48D8F42972DB1A00D6D205 /* Env+Window.swift in Sources */,
6C5FDF7A29E6160000BC08C0 /* AppSettings.swift in Sources */,
Expand Down
46 changes: 30 additions & 16 deletions CodeEdit/Features/About/Views/BlurButtonStyle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@ import SwiftUI

extension ButtonStyle where Self == BlurButtonStyle {
static var blur: BlurButtonStyle { BlurButtonStyle() }
static var secondaryBlur: BlurButtonStyle { BlurButtonStyle(isSecondary: true) }
}

struct BlurButtonStyle: ButtonStyle {
var isSecondary: Bool = false

@Environment(\.controlSize)
var controlSize

@Environment(\.colorScheme)
var colorScheme

var height: CGFloat {
switch controlSize {
case .large:
Expand All @@ -24,32 +30,40 @@ struct BlurButtonStyle: ButtonStyle {
}
}

@Environment(\.colorScheme)
var colorScheme

func makeBody(configuration: Configuration) -> some View {
configuration.label
.padding(.horizontal, 8)
.frame(height: height)
.buttonStyle(.bordered)
.background {
switch colorScheme {
case .dark:
Color
.gray
.opacity(0.001)
.overlay(.regularMaterial.blendMode(.plusLighter))
.overlay(Color.gray.opacity(0.30))
.overlay(Color.white.opacity(configuration.isPressed ? 0.20 : 0.00))
ZStack {
Color.gray.opacity(0.001)
if isSecondary {
Rectangle()
.fill(.regularMaterial)
} else {
Rectangle()
.fill(.regularMaterial)
.blendMode(.plusLighter)
}
Color.gray.opacity(isSecondary ? 0.10 : 0.30)
Color.white.opacity(configuration.isPressed ? 0.10 : 0.00)
}
case .light:
Color
.gray
.opacity(0.001)
.overlay(.regularMaterial.blendMode(.darken))
.overlay(Color.gray.opacity(0.15).blendMode(.plusDarker))
ZStack {
Color.gray.opacity(0.001)
Rectangle()
.fill(.regularMaterial)
.blendMode(.darken)
Color.gray.opacity(isSecondary ? 0.05 : 0.15)
.blendMode(.plusDarker)
Color.gray.opacity(configuration.isPressed ? 0.10 : 0.00)
}
@unknown default:
Color.black
}
}
.clipShape(RoundedRectangle(cornerRadius: 6))
.clipShape(RoundedRectangle(cornerRadius: controlSize == .large ? 6 : 5))
}
}
98 changes: 98 additions & 0 deletions CodeEdit/Features/CodeEditUI/Views/FeatureIcon.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
//
// FeatureIcon.swift
// CodeEdit
//
// Created by Austin Condiff on 12/2/24.
//

import SwiftUI
import CodeEditSymbols

struct FeatureIcon: View {
private let content: IconContent
private let color: Color?
private let size: CGFloat

init(
symbol: String,
color: Color? = nil,
size: CGFloat? = nil
) {
self.content = .symbol(symbol)
self.color = color ?? .accentColor
self.size = size ?? 20
}

init(
text: String,
textColor: Color? = nil,
color: Color? = nil,
size: CGFloat? = nil
) {
self.content = .text(text, textColor: textColor)
self.color = color ?? .accentColor
self.size = size ?? 20
}

init(
image: Image,
size: CGFloat? = nil
) {
self.content = .image(image)
self.color = nil
self.size = size ?? 20
}

private func getSafeImage(named: String) -> Image {
if NSImage(systemSymbolName: named, accessibilityDescription: nil) != nil {
return Image(systemName: named)
} else {
return Image(symbol: named)
}
}

var body: some View {
RoundedRectangle(cornerRadius: size / 4, style: .continuous)
.fill(background)
.overlay {
switch content {
case let .symbol(name):
getSafeImage(named: name)
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(.white)
.padding(size / 8)
case let .text(text, textColor):
Text(text)
.font(.system(size: size * 0.65))
.foregroundColor(textColor ?? .primary)
case let .image(image):
image
.resizable()
.aspectRatio(contentMode: .fill)
}
}
.clipShape(RoundedRectangle(cornerRadius: size / 4, style: .continuous))
.shadow(
color: Color(NSColor.black).opacity(0.25),
radius: size / 40,
y: size / 40
)
.frame(width: size, height: size)
}

private var background: AnyShapeStyle {
switch content {
case .symbol, .text:
return AnyShapeStyle((color ?? .accentColor).gradient)
case .image:
return AnyShapeStyle(.regularMaterial)
}
}
}

private enum IconContent {
case symbol(String)
case text(String, textColor: Color?)
case image(Image)
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ extension CodeEditWindowController {
.branchPicker,
.flexibleSpace,
.activityViewer,
.notificationItem,
.flexibleSpace,
.itemListTrackingSeparator,
.flexibleSpace,
Expand All @@ -47,6 +48,7 @@ extension CodeEditWindowController {
.toggleLastSidebarItem,
.branchPicker,
.activityViewer,
.notificationItem,
.startTaskSidebarItem,
.stopTaskSidebarItem
]
Expand Down Expand Up @@ -173,6 +175,11 @@ extension CodeEditWindowController {
strongWidth
])

toolbarItem.view = view
return toolbarItem
case .notificationItem:
let toolbarItem = NSToolbarItem(itemIdentifier: .notificationItem)
let view = NSHostingView(rootView: NotificationToolbarItem())
toolbarItem.view = view
return toolbarItem
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,5 @@ extension NSToolbarItem.Identifier {
static let itemListTrackingSeparator = NSToolbarItem.Identifier("ItemListTrackingSeparator")
static let branchPicker: NSToolbarItem.Identifier = NSToolbarItem.Identifier("BranchPicker")
static let activityViewer: NSToolbarItem.Identifier = NSToolbarItem.Identifier("ActivityViewer")
static let notificationItem = NSToolbarItem.Identifier("notificationItem")
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,19 @@ struct FileInspectorView: View {
}

@ViewBuilder private var fileNameField: some View {
@State var isValid: Bool = true

if let file {
TextField("Name", text: $fileName)
.background(
file.validateFileName(for: fileName) ? Color.clear : Color(errorRed)
isValid ? Color.clear : Color(errorRed)
Comment thread
austincondiff marked this conversation as resolved.
Outdated
)
.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(
Expand All @@ -109,6 +112,7 @@ struct FileInspectorView: View {
}
}
} else {
isValid = false
fileName = file.labelFileName()
}
}
Expand Down
Loading