diff --git a/Easydict/NewApp/Configuration/Configuration+Defaults.swift b/Easydict/NewApp/Configuration/Configuration+Defaults.swift index 240aed001..ea4839965 100644 --- a/Easydict/NewApp/Configuration/Configuration+Defaults.swift +++ b/Easydict/NewApp/Configuration/Configuration+Defaults.swift @@ -10,12 +10,6 @@ import Defaults import Foundation import Magnet -/// Utils -extension Defaults.Keys { - /// is first launch - static let firstLaunch = Key("EZConfiguration_kFirstLaunch", default: true) -} - // Setting extension Defaults.Keys { // rename `from` @@ -178,26 +172,26 @@ extension Defaults.Keys { /// shortcut extension Defaults.Keys { // Global - static let selectionShortcut = Key("EZSelectionShortcutKey_keyHolder") - static let snipShortcut = Key("EZSnipShortcutKey_keyHolder") - static let inputShortcut = Key("EZInputShortcutKey_keyHolder") - static let screenshotOCRShortcut = Key("EZScreenshotOCRShortcutKey_keyHolder") - static let showMiniWindowShortcut = Key("EZShowMiniShortcutKey_keyHolder") + static let selectionShortcut = Key("EZSelectionShortcutKey_keyHolder", default: KeyCombo(key: .d, cocoaModifiers: .option)) + static let snipShortcut = Key("EZSnipShortcutKey_keyHolder", default: KeyCombo(key: .s, cocoaModifiers: .option)) + static let inputShortcut = Key("EZInputShortcutKey_keyHolder", default: KeyCombo(key: .a, cocoaModifiers: .option)) + static let screenshotOCRShortcut = Key("EZScreenshotOCRShortcutKey_keyHolder", default: KeyCombo(key: .f, cocoaModifiers: [.option, .shift])) + static let showMiniWindowShortcut = Key("EZShowMiniShortcutKey_keyHolder", default: KeyCombo(key: .s, cocoaModifiers: .option)) // App - static let clearInputShortcut = Key("EZClearInputShortcutKey_keyHolder") - static let clearAllShortcut = Key("EZClearAllShortcutKey_keyHolder") - static let copyShortcut = Key("EZCopyShortcutKey_keyHolder") - static let copyFirstResultShortcut = Key("EZCopyFirstResultShortcutKey_keyHolder") - static let focusShortcut = Key("EZFocusShortcutKey_keyHolder") - static let playShortcut = Key("EZPlayShortcutKey_keyHolder") - static let retryShortcut = Key("EZRetryShortcutKey_keyHolder") - static let toggleShortcut = Key("EZToggleShortcutKey_keyHolder") - static let pinShortcut = Key("EZPinShortcutKey_keyHolder") - static let hideShortcut = Key("EZHideShortcutKey_keyHolder") - static let increaseFontSize = Key("EZIncreaseFontSizeShortcutKey_keyHolder") - static let decreaseFontSize = Key("EZDecreaseFontSizeShortcutKey_keyHolder") - static let googleShortcut = Key("EZGoogleShortcutKey_keyHolder") - static let eudicShortcut = Key("EZEudicShortcutKey_keyHolder") - static let appleDictionaryShortcut = Key("EZAppleDictionaryShortcutKey_keyHolder") + static let clearInputShortcut = Key("EZClearInputShortcutKey_keyHolder", default: KeyCombo(key: .k, cocoaModifiers: .command)) + static let clearAllShortcut = Key("EZClearAllShortcutKey_keyHolder", default: KeyCombo(key: .k, cocoaModifiers: [.command, .shift])) + static let copyShortcut = Key("EZCopyShortcutKey_keyHolder", default: KeyCombo(key: .c, cocoaModifiers: [.command, .shift])) + static let copyFirstResultShortcut = Key("EZCopyFirstResultShortcutKey_keyHolder", default: KeyCombo(key: .j, cocoaModifiers: [.command, .shift])) + static let focusShortcut = Key("EZFocusShortcutKey_keyHolder", default: KeyCombo(key: .i, cocoaModifiers: .command)) + static let playShortcut = Key("EZPlayShortcutKey_keyHolder", default: KeyCombo(key: .s, cocoaModifiers: .command)) + static let retryShortcut = Key("EZRetryShortcutKey_keyHolder", default: KeyCombo(key: .r, cocoaModifiers: .command)) + static let toggleShortcut = Key("EZToggleShortcutKey_keyHolder", default: KeyCombo(key: .t, cocoaModifiers: .command)) + static let pinShortcut = Key("EZPinShortcutKey_keyHolder", default: KeyCombo(key: .p, cocoaModifiers: .command)) + static let hideShortcut = Key("EZHideShortcutKey_keyHolder", default: KeyCombo(key: .y, cocoaModifiers: .command)) + static let increaseFontSize = Key("EZIncreaseFontSizeShortcutKey_keyHolder", default: KeyCombo(key: .keypadPlus, cocoaModifiers: .command)) + static let decreaseFontSize = Key("EZDecreaseFontSizeShortcutKey_keyHolder", default: KeyCombo(key: .keypadMinus, cocoaModifiers: .command)) + static let googleShortcut = Key("EZGoogleShortcutKey_keyHolder", default: KeyCombo(key: .return, cocoaModifiers: .command)) + static let eudicShortcut = Key("EZEudicShortcutKey_keyHolder", default: KeyCombo(key: .return, cocoaModifiers: [.command, .shift])) + static let appleDictionaryShortcut = Key("EZAppleDictionaryShortcutKey_keyHolder", default: KeyCombo(key: .d, cocoaModifiers: [.command, .shift])) } diff --git a/Easydict/NewApp/Feature/Shortcut/Shortcut+Default.swift b/Easydict/NewApp/Feature/Shortcut/Shortcut+Default.swift index d48d74d1d..f24d8c5c3 100644 --- a/Easydict/NewApp/Feature/Shortcut/Shortcut+Default.swift +++ b/Easydict/NewApp/Feature/Shortcut/Shortcut+Default.swift @@ -8,24 +8,3 @@ import Defaults import Magnet - -extension Shortcut { - // set defalut for app shortcut - func setDefaultForAppShortcut() { - Defaults[.clearInputShortcut] = KeyCombo(key: .k, cocoaModifiers: .command) - Defaults[.clearAllShortcut] = KeyCombo(key: .k, cocoaModifiers: [.command, .shift]) - Defaults[.copyShortcut] = KeyCombo(key: .c, cocoaModifiers: [.command, .shift]) - Defaults[.copyFirstResultShortcut] = KeyCombo(key: .j, cocoaModifiers: [.command, .shift]) - Defaults[.focusShortcut] = KeyCombo(key: .i, cocoaModifiers: .command) - Defaults[.playShortcut] = KeyCombo(key: .s, cocoaModifiers: .command) - Defaults[.retryShortcut] = KeyCombo(key: .r, cocoaModifiers: .command) - Defaults[.toggleShortcut] = KeyCombo(key: .t, cocoaModifiers: .command) - Defaults[.pinShortcut] = KeyCombo(key: .p, cocoaModifiers: .command) - Defaults[.hideShortcut] = KeyCombo(key: .y, cocoaModifiers: .command) - Defaults[.increaseFontSize] = KeyCombo(key: .keypadPlus, cocoaModifiers: .command) - Defaults[.decreaseFontSize] = KeyCombo(key: .keypadMinus, cocoaModifiers: .command) - Defaults[.googleShortcut] = KeyCombo(key: .return, cocoaModifiers: .command) - Defaults[.eudicShortcut] = KeyCombo(key: .return, cocoaModifiers: [.command, .shift]) - Defaults[.appleDictionaryShortcut] = KeyCombo(key: .d, cocoaModifiers: [.command, .shift]) - } -} diff --git a/Easydict/NewApp/Feature/Shortcut/Shortcut.swift b/Easydict/NewApp/Feature/Shortcut/Shortcut.swift index c08c2dc2a..d4be0b625 100644 --- a/Easydict/NewApp/Feature/Shortcut/Shortcut.swift +++ b/Easydict/NewApp/Feature/Shortcut/Shortcut.swift @@ -99,14 +99,6 @@ class Shortcut: NSObject { @objc static func setupShortcut() { let shortcut = Shortcut.shared shortcut.restoreShortcut() - - if Defaults[.firstLaunch] { - Defaults[.firstLaunch] = false - // set defalut for app shortcut - shortcut.setDefaultForAppShortcut() - } else { - // do nothing - } } // Make sure the class has only one instance