feat: new keyboard shortcuts and handle select projects using tab (#8)

falcucci · alex35mil · web-flow · commit 64a729ea0eba · 2024-05-05T13:35:44.000+04:00
* feat: implement new keyboard shortcuts and handling methods in switcher window

- add a swift gitignore file
- update development team identifier in xcode project file
- add a new togglefixedwindow keyboard shortcut
- add a new case for `fixed` sort target in editorstore class
- update command in editorstore class
- add new togglefixedwindow handling method in switcherwindow class
- add new navigateprojects method in switcherlistview struct

* refactor: tab key logic and optimize binary files

- refactor switcher list view logic for tab key press
- update the calculation of `selectedindex` for tab key press

* refactor: switcherview functionality

- remove the `navigateprojects` function from `switcherlistview` in `switcherview.swift`
- fix indentation in the `switcherlistview` struct in `switcherview.swift`

* refactor: standardize keyboard shortcut terminology and functionality

- change the keyboard shortcut name from `togglefixedwindow` to `togglepinnedwindow` in `app.swift`
- update the `editorstore.swift` file to replace `fixed` with `pinned` in the `sorttarget` enum and related functions
- modify the text and keyboard shortcut in the `settingsview.swift` file from `neohub hotkey` to `neovide hotkey` and change the shortcut from `togglefixedwindow` to `togglepinnedwindow`
- refactor the `switcherwindow` class in `switcherview.swift` to use `togglepinnedwindow` instead of `togglefixedwindow` for keyboard shortcuts

* chore: update development team in xcode project configuration

- update `development_team` from `x8cnw77992` to `q62v4yp545` in `neohub.xcodeproj/project.pbxproj` multiple times

* refactor: variable names across files

- update a variable name from `fixed` to `pinned` in the `editorstore.swift` file

* refactor: improved application behavior

- removed redundant code related to editor activation
- changed the behavior of hiding applications in specific scenarios

* refactor: optimize editor handling in application

- refactor `editorstore.swift` to always return the last used editor as pinned
- remove unnecessary code in the `editorstore.swift`
- refactor `switcherview.swift` to check if editors are not empty instead of counting them
- remove redundant activation code in `switcherview.swift`
- update a binary file `default.profraw`

* refactor: improve handling of key press events in switcherview

- change handling of key press event for `togglepinnedwindow` in `switcherview.swift`
- binary files `default.profraw` were modified

* refactor: key event handling in various files

- update `development_team` setting from `q62v4yp545` to `x8cnw77992` in `neohub.xcodeproj`
- change the key event from `onkeyup` to `onkeydown` in `switcherwindow` class in `switcherview.swift`

* chore: update project settings and optimize binary files

- update the `development_team` setting to q62v4yp545 in the project file
- binary files `a/default.profraw` and `b/default.profraw` differ

* style: standardize code formatting across project files

- update the indentation of the closing brace

* minor changes

* - remove unnecessary whitespace in switcherview.swift

* - add `dispatchqueue.main.async` to activate neovide first before activating nsapp

- remove unnecessary code line in editorstore.swift
- update default.profraw binary file

* feat: file structure and add directory creation method

- add a `createdirectoryifnotexists` method to the cli class
- call `createdirectoryifnotexists` in the `perform` method
- move the `createdirectoryifnotexists` implementation to the bottom of the cli.swift file.

* refactor: toggle switcher window condition in switcherview

- add a condition to toggle the switcher window if not already toggled in the switcherview.swift file
- binary files differ in the default.profraw file

* chore: update keyboard shortcuts and improve binary file handling

- update the default keyboard shortcut for `togglepinnedwindow`
- binary files `default.profraw` are different

* refactor: address review comments

---------

Co-authored-by: Alex Fedoseev &lt;alex@35mil.me&gt;
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,88 @@
+# Created by https://www.toptal.com/developers/gitignore/api/swift
+# Edit at https://www.toptal.com/developers/gitignore?templates=swift
+
+### Swift ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+build/
+DerivedData/
+*.moved-aside
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+
+## Obj-C/Swift specific
+*.hmap
+
+## App packaging
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+*.xcodeproj
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+# .swiftpm
+
+.build/
+
+# CocoaPods
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# Pods/
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build/
+
+# Accio dependency management
+Dependencies/
+.accio/
+
+# fastlane
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+# End of https://www.toptal.com/developers/gitignore/api/swift
diff --git a/NeoHub/App.swift b/NeoHub/App.swift
@@ -13,6 +13,11 @@ extension KeyboardShortcuts.Name {
         default: .init(.n, modifiers: [.command, .control])
     )
 
+    static let toggleLastActiveEditor = Self(
+        "toggleLastActiveEditor",
+        default: .init(.z, modifiers: [.command, .control])
+    )
+
     static let restartEditor = Self("restartEditor")
 }
 
diff --git a/NeoHub/CLI.swift b/NeoHub/CLI.swift
@@ -9,6 +9,10 @@ private struct Bin {
 private struct Lib {
     static let source = Bundle.main.bundlePath + "/Contents/Frameworks/NeoHubLib.framework"
     static let destination = "/usr/local/lib/NeoHubLib.framework"
+
+    static var parent: String {
+        return URL(fileURLWithPath: destination).deletingLastPathComponent().path
+    }
 }
 
 enum CLIOperation {
@@ -57,6 +61,7 @@ final class CLI: ObservableObject {
 
     static func getStatus() -> CLIStatus {
         let fs = FileManager.default
+
         let installed = fs.fileExists(atPath: Bin.destination) && fs.fileExists(atPath: Lib.destination)
 
         if !installed {
@@ -83,7 +88,7 @@ final class CLI: ObservableObject {
             let script =
             switch operation {
                 case .install:
-                    "do shell script \"cp -Rf \(Lib.source) \(Lib.destination) && cp -f \(Bin.source) \(Bin.destination)\" with administrator privileges"
+                    "do shell script \"mkdir -p \(Lib.parent) && cp -Rf \(Lib.source) \(Lib.destination) && cp -f \(Bin.source) \(Bin.destination)\" with administrator privileges"
                 case .uninstall:
                     "do shell script \"rm \(Bin.destination) && rm -rf \(Lib.destination)\" with administrator privileges"
             }
diff --git a/NeoHub/EditorStore.swift b/NeoHub/EditorStore.swift
@@ -24,6 +24,7 @@ final class EditorStore: ObservableObject {
     public enum SortTarget {
         case menubar
         case switcher
+        case lastActiveEditor
     }
 
     public func getEditors() -> [Editor] {
@@ -36,6 +37,12 @@ final class EditorStore: ObservableObject {
         switch sortTarget {
             case .menubar:
                 return editors.sorted { $0.name > $1.name }
+            case .lastActiveEditor:
+                if let lastActiveEditor = editors.max(by: { $0.lastAcceessTime < $1.lastAcceessTime }) {
+                    return [lastActiveEditor]
+                } else {
+                    return []
+                }
             case .switcher:
                 var sorted = editors.sorted { $0.lastAcceessTime > $1.lastAcceessTime }
 
@@ -330,7 +337,6 @@ final class Editor: Identifiable {
             NSApp.activate(ignoringOtherApps: true)
 
             let activated = app.activate()
-
             if !activated {
                 let error = ReportableError("Failed to activate Neovide instance")
                 log.error("\(error)")
diff --git a/NeoHub/views/SettingsView.swift b/NeoHub/views/SettingsView.swift
@@ -38,6 +38,14 @@ struct SettingsView: View {
                 .padding(.horizontal)
                 .padding(.vertical, 10)
 
+                HStack {
+                    Text("Toggle Last Active Editor")
+                    Spacer()
+                    KeyboardShortcuts.Recorder("", name: .toggleLastActiveEditor)
+                }
+                .padding(.horizontal)
+                .padding(.vertical, 10)
+
                 Divider().padding(.horizontal)
 
                 HStack {
diff --git a/NeoHub/views/SwitcherView.swift b/NeoHub/views/SwitcherView.swift
@@ -3,6 +3,7 @@ import KeyboardShortcuts
 
 struct Key {
     static let ESC: UInt16 = 53
+    static let TAB: UInt16 = 48
     static let ENTER: UInt16 = 36
     static let ARROW_UP: UInt16 = 126
     static let ARROW_DOWN: UInt16 = 125
@@ -106,11 +107,42 @@ final class SwitcherWindow: ObservableObject {
 
         window.center()
 
-        KeyboardShortcuts.onKeyUp(for: .toggleSwitcher) { [self] in
+        KeyboardShortcuts.onKeyDown(for: .toggleLastActiveEditor) { [self] in
+            self.handleLastActiveEditorToggle()
+        }
+
+        KeyboardShortcuts.onKeyDown(for: .toggleSwitcher) { [self] in
             self.handleSwitcherToggle()
         }
     }
 
+    private func handleLastActiveEditorToggle() {
+        let editors = editorStore.getEditors(sortedFor: .lastActiveEditor)
+
+        if !editors.isEmpty {
+            let editor = editors.first!
+            let application = NSRunningApplication(processIdentifier: editor.processIdentifier)
+            switch NSWorkspace.shared.frontmostApplication {
+                case .some(let app):
+                    if app.processIdentifier == editor.processIdentifier {
+                        application?.hide()
+                    } else {
+                        activationManager.setActivationTarget(
+                            currentApp: app,
+                            switcherWindow: self.selfRef,
+                            editors: editors
+                        )
+                        application?.activate()
+                    }
+                case .none:
+                    let application = NSRunningApplication(processIdentifier: editor.processIdentifier)
+                    application?.hide()
+            }
+        } else {
+            self.toggle()
+        }
+    }
+
     private func handleSwitcherToggle() {
         let editors = editorStore.getEditors()
 
@@ -386,6 +418,9 @@ struct SwitcherListView: View {
                             selectedIndex += 1
                         }
                         return nil
+                    case Key.TAB:
+                        selectedIndex = (selectedIndex + 1) % self.filterEditors().count
+                        return nil
                     case Key.ENTER:
                         let editors = self.filterEditors()
                         if editors.indices.contains(selectedIndex) {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,11 @@ extension KeyboardShortcuts.Name {`
`13`	`13`	`default: .init(.n, modifiers: [.command, .control])`
`14`	`14`	`)`
`15`	`15`
	`16`	`+ static let toggleLastActiveEditor = Self(`
	`17`	`+ "toggleLastActiveEditor",`
	`18`	`+ default: .init(.z, modifiers: [.command, .control])`
	`19`	`+ )`
	`20`	`+`
`16`	`21`	`static let restartEditor = Self("restartEditor")`
`17`	`22`	`}`
`18`	`23`