Skip to content

Feat: sort commands #2

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

Merged
jarne merged 2 commits into from
Jul 27, 2025
Merged

Feat: sort commands #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5097c84
Add position attribute and sort feature to commands
jarne Jul 27, 2025
48a596f
Fix code formatting lint issues
jarne Jul 27, 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
20 changes: 16 additions & 4 deletions Commandoak/Model/Command.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@ import SwiftData

@Model
final class Command {
var name: String
var icon: String
var execute: String
static let defaultName = "New command"
static let defaultIcon = "🕹️"
static let defaultExecute = ""
static let defaultPosition = 0

init(name: String = "New command", icon: String = "🕹️", execute: String = "") {
var name: String = defaultName
var icon: String = defaultIcon
var execute: String = defaultExecute
var position: Int = defaultPosition

init(
name: String = defaultName,
icon: String = defaultIcon,
execute: String = defaultExecute,
position: Int = defaultPosition
) {
self.name = name
self.icon = icon
self.execute = execute
self.position = position
}
}
20 changes: 16 additions & 4 deletions Commandoak/View/CommandsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import SwiftData

struct CommandsView: View {
@Environment(\.modelContext) private var modelContext
@Query private var commands: [Command]
@Query(sort: \Command.position) private var commands: [Command]

var body: some View {
NavigationSplitView {
Expand All @@ -21,6 +21,7 @@ struct CommandsView: View {
Text(cmd.name)
}
}
.onMove(perform: moveItems)
.onDelete(perform: deleteItems)
}
.navigationSplitViewColumnWidth(min: 180, ideal: 200)
Expand All @@ -38,12 +39,23 @@ struct CommandsView: View {

private func addItem() {
withAnimation {
let newItem = Command()
modelContext.insert(newItem)
let newCmd = Command(position: commands.count)
modelContext.insert(newCmd)
}
}

private func deleteItems(offsets: IndexSet) {
private func moveItems(from source: IndexSet, to destination: Int) {
withAnimation {
var sortedCommands = commands
sortedCommands.move(fromOffsets: source, toOffset: destination)

for (index, cmd) in sortedCommands.enumerated() {
cmd.position = index
}
}
}

private func deleteItems(at offsets: IndexSet) {
withAnimation {
for index in offsets {
modelContext.delete(commands[index])
Expand Down
2 changes: 1 addition & 1 deletion Commandoak/View/Menu/CommandsMenuBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import SwiftData
struct CommandsMenuBarView: View {
@Environment(\.openWindow) private var openWindow

@Query private var commands: [Command]
@Query(sort: \Command.position) private var commands: [Command]

var body: some View {
ForEach(Array(commands.enumerated()), id: \.offset) { index, cmd in
Expand Down