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

✨ Improve import/export keybinds functionality #653

Merged
merged 2 commits into from
Dec 30, 2024
+407 −290
Merged

✨ Improve import/export keybinds functionality #653

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
5dfd894
✨ Improve import/export keybinds functionality
MrKai77 Dec 30, 2024
4b3bc02
🎨 Move `private` to extension-level + general code improvements
MrKai77 Dec 30, 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
8 changes: 4 additions & 4 deletions Loop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
4CD883A42C30F0D7009A132A /* WallpaperColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD883A32C30F0D7009A132A /* WallpaperColors.swift */; };
A8055EC22AFEDE0B00459D13 /* Keycorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8055EC12AFEDE0B00459D13 /* Keycorder.swift */; };
A80900D52AA3F9F30085C63B /* VisualEffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A80900D32AA3F9F20085C63B /* VisualEffectView.swift */; };
A80D49BB2BAE479900493B67 /* WindowAction+Port.swift in Sources */ = {isa = PBXBuildFile; fileRef = A80D49BA2BAE479900493B67 /* WindowAction+Port.swift */; };
A80D49BB2BAE479900493B67 /* Migrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A80D49BA2BAE479900493B67 /* Migrator.swift */; };
A81B98182BDC854F005FD78C /* AboutConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = A81B98172BDC854F005FD78C /* AboutConfiguration.swift */; };
A81D8D0A2C068B8700188E12 /* LuminarePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A81D8D092C068B8700188E12 /* LuminarePreviewView.swift */; };
A81D8D0C2C06950000188E12 /* LuminareManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A81D8D0B2C06950000188E12 /* LuminareManager.swift */; };
Expand Down Expand Up @@ -103,7 +103,7 @@
A80521312A84878200BF7E22 /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
A8055EC12AFEDE0B00459D13 /* Keycorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keycorder.swift; sourceTree = "<group>"; };
A80900D32AA3F9F20085C63B /* VisualEffectView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VisualEffectView.swift; sourceTree = "<group>"; };
A80D49BA2BAE479900493B67 /* WindowAction+Port.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WindowAction+Port.swift"; sourceTree = "<group>"; };
A80D49BA2BAE479900493B67 /* Migrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Migrator.swift; sourceTree = "<group>"; };
A80FB1EB2C99152300139B4A /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
A81B98172BDC854F005FD78C /* AboutConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutConfiguration.swift; sourceTree = "<group>"; };
A81D8D092C068B8700188E12 /* LuminarePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LuminarePreviewView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -225,6 +225,7 @@
A8D4327A2C13ED3C007BE4F2 /* Icon.swift */,
A867C20D2C26522B005831BC /* Observer.swift */,
A8D6D3002B6C894C0061B11F /* PaddingModel.swift */,
A80D49BA2BAE479900493B67 /* Migrator.swift */,
4C0F2ACE2C3CFD09006CB34D /* RectangleTranslationLayer.swift */,
A86B97AC2AB79E2500099D7F /* ShakeEffect.swift */,
A80900D32AA3F9F20085C63B /* VisualEffectView.swift */,
Expand Down Expand Up @@ -305,7 +306,6 @@
A8BC4A6D2C2F4C9800B94B82 /* Window.swift */,
A8878A242AA3B2C800850A66 /* WindowTransformAnimation.swift */,
A8F0125A2AEDD7660017307F /* WindowAction.swift */,
A80D49BA2BAE479900493B67 /* WindowAction+Port.swift */,
0A6DC3EA2BB869DE002AB05F /* WindowAction+Image.swift */,
A8330AD32A3AC27600673C8D /* WindowDirection.swift */,
A85DDBD92C1693D4008C103D /* WindowDirection+Snapping.swift */,
Expand Down Expand Up @@ -588,7 +588,7 @@
A82DDBDE2AEC736300D7F974 /* AnimationConfiguration.swift in Sources */,
A8789F6729805B190040512E /* RadialMenuView.swift in Sources */,
A8330ABD2A3AC0CA00673C8D /* Bundle+Extensions.swift in Sources */,
A80D49BB2BAE479900493B67 /* WindowAction+Port.swift in Sources */,
A80D49BB2BAE479900493B67 /* Migrator.swift in Sources */,
4C0F2ACF2C3CFD09006CB34D /* RectangleTranslationLayer.swift in Sources */,
A8D4327B2C13ED3C007BE4F2 /* Icon.swift in Sources */,
A86B97AD2AB79E2500099D7F /* ShakeEffect.swift in Sources */,
Expand Down
1 change: 0 additions & 1 deletion Loop/Extensions/Notification+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ extension Notification.Name {
static let activeStateChanged = Notification.Name("activeStateChanged")

static let systemWindowManagerStateChanged = Notification.Name("systemWindowManagerStateChanged")
static let keybindsUpdated = Notification.Name("keybindsUpdated")

static let didImportKeybindsSuccessfully = Notification.Name("didImportKeybindsSuccessfully")
static let didExportKeybindsSuccessfully = Notification.Name("didExportKeybindsSuccessfully")
Expand Down
17 changes: 14 additions & 3 deletions Loop/Luminare/Loop/AdvancedConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,13 @@ struct AdvancedConfigurationView: View {
LuminareSection("Keybinds") {
HStack(spacing: 2) {
Button {
WindowAction.importPrompt()
Task {
do {
try await Migrator.importPrompt()
} catch {
print("Error importing keybinds: \(error)")
}
}
} label: {
HStack {
Text("Import")
Expand All @@ -174,7 +180,13 @@ struct AdvancedConfigurationView: View {
}

Button {
WindowAction.exportPrompt()
Task {
do {
try await Migrator.exportPrompt()
} catch {
print("Error exporting keybinds: \(error)")
}
}
} label: {
HStack {
Text("Export")
Expand All @@ -193,7 +205,6 @@ struct AdvancedConfigurationView: View {
Button {
Defaults.reset(.keybinds)
model.resetSuccessfully()
Notification.Name.keybindsUpdated.post()
} label: {
HStack {
Text("Reset")
Expand Down
22 changes: 6 additions & 16 deletions Loop/Luminare/Settings/Keybindings/KeybindsConfigurationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import Luminare
import SwiftUI

class KeybindsConfigurationModel: ObservableObject {
@Published var triggerKey = Defaults[.triggerKey] {
didSet { Defaults[.triggerKey] = triggerKey }
}

@Published var triggerDelay = Defaults[.triggerDelay] {
didSet { Defaults[.triggerDelay] = triggerDelay }
}
Expand All @@ -26,21 +22,20 @@ class KeybindsConfigurationModel: ObservableObject {
didSet { Defaults[.middleClickTriggersLoop] = middleClickTriggersLoop }
}

@Published var keybinds = Defaults[.keybinds] {
didSet { Defaults[.keybinds] = keybinds }
}

@Published var currentEventMonitor: NSEventMonitor?
@Published var selectedKeybinds = Set<WindowAction>()
}

struct KeybindsConfigurationView: View {
@StateObject private var model = KeybindsConfigurationModel()

@Default(.triggerKey) var triggerKey
@Default(.keybinds) var keybinds

var body: some View {
LuminareSection("Trigger Key", noBorder: true) {
// TODO: Make long trigger keys fit in bounds
TriggerKeycorder($model.triggerKey)
TriggerKeycorder($triggerKey)
.environmentObject(model)
}

Expand All @@ -61,12 +56,10 @@ struct KeybindsConfigurationView: View {

LuminareList(
"Keybinds",
items: $model.keybinds,
items: $keybinds,
selection: $model.selectedKeybinds,
addAction: {
model.keybinds.insert(.init(.noAction), at: 0)
// Post a notification that the keybinds have been updated
NotificationCenter.default.post(name: .keybindsUpdated, object: nil)
keybinds.insert(.init(.noAction), at: 0)
},
content: { keybind in
KeybindItemView(keybind)
Expand All @@ -90,8 +83,5 @@ struct KeybindsConfigurationView: View {
addText: "Add",
removeText: "Remove"
)
.onReceive(.keybindsUpdated) { _ in
model.keybinds = Defaults[.keybinds]
}
}
}
Loading