Skip to content

Commit 05a40da

Browse files
Rename CommandPalleteView and CommandPalleteViewModel classes (#1655)
* Renamed the CommandPalleteView class to QuickActionsView to stay consistent with Xcode naming conventions * Renamed the CommandPalleteViewModel class to QuickActionsViewModel to stay consistent with Xcode naming conventions * Changed name of CommandPalette class to QuickActions in comment header Co-authored-by: Austin Condiff <austin.condiff@gmail.com> --------- Co-authored-by: Austin Condiff <austin.condiff@gmail.com>
1 parent 8036bb2 commit 05a40da

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

CodeEdit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@
243243
58F2EB0D292FB2B0004A9BDE /* ThemeSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58F2EAE0292FB2B0004A9BDE /* ThemeSettings.swift */; };
244244
58F2EB0E292FB2B0004A9BDE /* SoftwareUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58F2EAE1292FB2B0004A9BDE /* SoftwareUpdater.swift */; };
245245
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 58F2EB1D292FB954004A9BDE /* Sparkle */; };
246-
58FD7608291EA1CB0051D6E4 /* CommandPaletteViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FD7605291EA1CB0051D6E4 /* CommandPaletteViewModel.swift */; };
247-
58FD7609291EA1CB0051D6E4 /* CommandPaletteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FD7607291EA1CB0051D6E4 /* CommandPaletteView.swift */; };
246+
58FD7608291EA1CB0051D6E4 /* QuickActionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FD7605291EA1CB0051D6E4 /* QuickActionsViewModel.swift */; };
247+
58FD7609291EA1CB0051D6E4 /* QuickActionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FD7607291EA1CB0051D6E4 /* QuickActionsView.swift */; };
248248
5B241BF32B6DDBFF0016E616 /* IgnorePatternListItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B241BF22B6DDBFF0016E616 /* IgnorePatternListItemView.swift */; };
249249
5B698A0A2B262FA000DE9392 /* SearchSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B698A092B262FA000DE9392 /* SearchSettingsView.swift */; };
250250
5B698A0D2B26327800DE9392 /* SearchSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B698A0C2B26327800DE9392 /* SearchSettings.swift */; };
@@ -785,8 +785,8 @@
785785
58F2EADD292FB2B0004A9BDE /* AccountsSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsSettings.swift; sourceTree = "<group>"; };
786786
58F2EAE0292FB2B0004A9BDE /* ThemeSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeSettings.swift; sourceTree = "<group>"; };
787787
58F2EAE1292FB2B0004A9BDE /* SoftwareUpdater.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SoftwareUpdater.swift; sourceTree = "<group>"; };
788-
58FD7605291EA1CB0051D6E4 /* CommandPaletteViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandPaletteViewModel.swift; sourceTree = "<group>"; };
789-
58FD7607291EA1CB0051D6E4 /* CommandPaletteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommandPaletteView.swift; sourceTree = "<group>"; };
788+
58FD7605291EA1CB0051D6E4 /* QuickActionsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickActionsViewModel.swift; sourceTree = "<group>"; };
789+
58FD7607291EA1CB0051D6E4 /* QuickActionsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickActionsView.swift; sourceTree = "<group>"; };
790790
5B241BF22B6DDBFF0016E616 /* IgnorePatternListItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IgnorePatternListItemView.swift; sourceTree = "<group>"; };
791791
5B698A092B262FA000DE9392 /* SearchSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchSettingsView.swift; sourceTree = "<group>"; };
792792
5B698A0C2B26327800DE9392 /* SearchSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchSettings.swift; sourceTree = "<group>"; };
@@ -2205,15 +2205,15 @@
22052205
58FD7604291EA1CB0051D6E4 /* ViewModels */ = {
22062206
isa = PBXGroup;
22072207
children = (
2208-
58FD7605291EA1CB0051D6E4 /* CommandPaletteViewModel.swift */,
2208+
58FD7605291EA1CB0051D6E4 /* QuickActionsViewModel.swift */,
22092209
);
22102210
path = ViewModels;
22112211
sourceTree = "<group>";
22122212
};
22132213
58FD7606291EA1CB0051D6E4 /* Views */ = {
22142214
isa = PBXGroup;
22152215
children = (
2216-
58FD7607291EA1CB0051D6E4 /* CommandPaletteView.swift */,
2216+
58FD7607291EA1CB0051D6E4 /* QuickActionsView.swift */,
22172217
);
22182218
path = Views;
22192219
sourceTree = "<group>";
@@ -3248,7 +3248,7 @@
32483248
6C7256D729A3D7D000C2D3E0 /* SplitViewControllerView.swift in Sources */,
32493249
B6EA1FE529DA33DB001BF195 /* ThemeModel.swift in Sources */,
32503250
B6EA200029DB7966001BF195 /* SettingsColorPicker.swift in Sources */,
3251-
58FD7609291EA1CB0051D6E4 /* CommandPaletteView.swift in Sources */,
3251+
58FD7609291EA1CB0051D6E4 /* QuickActionsView.swift in Sources */,
32523252
58A2E40C29C3975D005CB615 /* CEWorkspaceFileIcon.swift in Sources */,
32533253
587B9E8F29301D8F00AC7927 /* BitBucketUserRouter.swift in Sources */,
32543254
B66A4E5129C917D5004573B4 /* AboutWindow.swift in Sources */,
@@ -3486,7 +3486,7 @@
34863486
2806E9022979588B000040F4 /* Contributor.swift in Sources */,
34873487
58D01C98293167DC00C5B6B4 /* String+RemoveOccurrences.swift in Sources */,
34883488
5878DAA8291AE76700DD95A3 /* QuickOpenItem.swift in Sources */,
3489-
58FD7608291EA1CB0051D6E4 /* CommandPaletteViewModel.swift in Sources */,
3489+
58FD7608291EA1CB0051D6E4 /* QuickActionsViewModel.swift in Sources */,
34903490
B65B11042B09DB1C002852CF /* GitClient+Fetch.swift in Sources */,
34913491
5878DA872918642F00DD95A3 /* AcknowledgementsViewModel.swift in Sources */,
34923492
B6E41C7929DE02800088F9F4 /* AccountSelectionView.swift in Sources */,

CodeEdit/Features/Commands/ViewModels/CommandPaletteViewModel.swift renamed to CodeEdit/Features/Commands/ViewModels/QuickActionsViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Foundation
99

1010
/// Simple state class for command palette view. Contains currently selected command,
1111
/// query text and list of filtered commands
12-
final class CommandPaletteViewModel: ObservableObject {
12+
final class QuickActionsViewModel: ObservableObject {
1313

1414
@Published var commandQuery: String = ""
1515

CodeEdit/Features/Commands/Views/CommandPaletteView.swift renamed to CodeEdit/Features/Commands/Views/QuickActionsView.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import SwiftUI
99

10-
/// Command palette view
11-
struct CommandPaletteView: View {
10+
/// Quick actions view
11+
struct QuickActionsView: View {
1212

1313
@Environment(\.colorScheme)
1414
private var colorScheme: ColorScheme
1515

16-
@ObservedObject private var state: CommandPaletteViewModel
16+
@ObservedObject private var state: QuickActionsViewModel
1717

1818
@ObservedObject private var commandManager: CommandManager = .shared
1919

@@ -23,7 +23,7 @@ struct CommandPaletteView: View {
2323

2424
private let closePalette: () -> Void
2525

26-
init(state: CommandPaletteViewModel, closePalette: @escaping () -> Void) {
26+
init(state: QuickActionsViewModel, closePalette: @escaping () -> Void) {
2727
self.state = state
2828
self.closePalette = closePalette
2929
state.filteredCommands = commandManager.commands

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
244244
} else {
245245
let panel = SearchPanel()
246246
self.commandPalettePanel = panel
247-
let contentView = CommandPaletteView(state: state, closePalette: panel.close)
247+
let contentView = QuickActionsView(state: state, closePalette: panel.close)
248248
panel.contentView = NSHostingView(rootView: SettingsInjector { contentView })
249249
window?.addChildWindow(panel, ordered: .above)
250250
panel.makeKeyAndOrderFront(self)

CodeEdit/Features/Documents/WorkspaceDocument.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class WorkspaceDocument: NSDocument, ObservableObject, NSToolbarDelegate {
3333
var utilityAreaModel = UtilityAreaViewModel()
3434
var searchState: SearchState?
3535
var quickOpenViewModel: QuickOpenViewModel?
36-
var commandsPaletteState: CommandPaletteViewModel?
36+
var commandsPaletteState: QuickActionsViewModel?
3737
var listenerModel: WorkspaceNotificationModel = .init()
3838
var sourceControlManager: SourceControlManager?
3939

0 commit comments

Comments
 (0)