refactor: quick slot 로직을 개선합니다

Box42.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		D65C5C7C2AA195AB00BD291A /* prefsHelper.app in Resources */ = {isa = PBXBuildFile; fileRef = D65C5C7B2AA195AB00BD291A /* prefsHelper.app */; };
 		DE018BB32A5099F900FF0AA3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE018BB22A5099F900FF0AA3 /* AppDelegate.swift */; };
 		DE018BB82A5099F900FF0AA3 /* Box42.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DE018BB62A5099F900FF0AA3 /* Box42.xcdatamodeld */; };
 		DE018BDD2A509AEB00FF0AA3 /* EventMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE018BDC2A509AEB00FF0AA3 /* EventMonitor.swift */; };
@@ -125,11 +124,15 @@
 		DEF0762A2AA3B955005700E5 /* PutUserMeQuickSlot.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF076292AA3B955005700E5 /* PutUserMeQuickSlot.swift */; };
 		DEF0762D2AA3C34C005700E5 /* GetUserMeQuickSlot.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0762C2AA3C34C005700E5 /* GetUserMeQuickSlot.swift */; };
 		DEF076302AA3CF8A005700E5 /* QuickSlotItemLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0762F2AA3CF8A005700E5 /* QuickSlotItemLabel.swift */; };
+		DEF076362AA47FDB005700E5 /* QuickSlotManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF076352AA47FDB005700E5 /* QuickSlotManagerViewController.swift */; };
+		DEF0763A2AA480C6005700E5 /* QuickSlotTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF076392AA480C6005700E5 /* QuickSlotTableView.swift */; };
+		DEF0763D2AA48125005700E5 /* QuickSlotCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0763C2AA48125005700E5 /* QuickSlotCell.swift */; };
+		DEF076402AA4845E005700E5 /* QuickSlotCellManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0763F2AA4845E005700E5 /* QuickSlotCellManager.swift */; };
+		DEF076432AA48AF0005700E5 /* QuickSlotCellDeleteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF076422AA48AF0005700E5 /* QuickSlotCellDeleteButton.swift */; };
 		DEF749322A85657600D987C8 /* NSScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF749312A85657600D987C8 /* NSScreen.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		D65C5C7B2AA195AB00BD291A /* prefsHelper.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = prefsHelper.app; path = ../../Downloads/prefsHelper.app; sourceTree = "<group>"; };
 		DE018BAF2A5099F900FF0AA3 /* Box42.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Box42.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE018BB22A5099F900FF0AA3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		DE018BB72A5099F900FF0AA3 /* Box42.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Box42.xcdatamodel; sourceTree = "<group>"; };
@@ -249,6 +252,11 @@
 		DEF076292AA3B955005700E5 /* PutUserMeQuickSlot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PutUserMeQuickSlot.swift; sourceTree = "<group>"; };
 		DEF0762C2AA3C34C005700E5 /* GetUserMeQuickSlot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetUserMeQuickSlot.swift; sourceTree = "<group>"; };
 		DEF0762F2AA3CF8A005700E5 /* QuickSlotItemLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotItemLabel.swift; sourceTree = "<group>"; };
+		DEF076352AA47FDB005700E5 /* QuickSlotManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotManagerViewController.swift; sourceTree = "<group>"; };
+		DEF076392AA480C6005700E5 /* QuickSlotTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotTableView.swift; sourceTree = "<group>"; };
+		DEF0763C2AA48125005700E5 /* QuickSlotCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotCell.swift; sourceTree = "<group>"; };
+		DEF0763F2AA4845E005700E5 /* QuickSlotCellManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotCellManager.swift; sourceTree = "<group>"; };
+		DEF076422AA48AF0005700E5 /* QuickSlotCellDeleteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotCellDeleteButton.swift; sourceTree = "<group>"; };
 		DEF7492E2A85603700D987C8 /* nodeInstall.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = nodeInstall.sh; sourceTree = "<group>"; };
 		DEF749312A85657600D987C8 /* NSScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSScreen.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -268,7 +276,6 @@
 		DE018BA62A5099F900FF0AA3 = {
 			isa = PBXGroup;
 			children = (
-				D65C5C7B2AA195AB00BD291A /* prefsHelper.app */,
 				DE018BB12A5099F900FF0AA3 /* Box42 */,
 				DE018BB02A5099F900FF0AA3 /* Products */,
 				DE17AF722A834A1600325BF4 /* Frameworks */,
@@ -660,6 +667,7 @@
 		DE98E8412A98DDEB00F8744A /* View */ = {
 			isa = PBXGroup;
 			children = (
+				DEF076382AA480B7005700E5 /* Table */,
 				DE44081C2A928F760091937A /* Divider.swift */,
 				DE97CA782A9A6F6A001073DE /* QuickSlotHeaderView.swift */,
 				DE97CA7B2A9A7199001073DE /* QuickSlotGroupView.swift */,
@@ -741,6 +749,7 @@
 			children = (
 				DE98E8422A98DDFD00F8744A /* QuickSlotViewController.swift */,
 				DE6332F12A9BCA2C00DCFAF6 /* QuickSlotScriptsLogicController.swift */,
+				DEF076352AA47FDB005700E5 /* QuickSlotManagerViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -753,6 +762,17 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
+		DEF076382AA480B7005700E5 /* Table */ = {
+			isa = PBXGroup;
+			children = (
+				DEF076392AA480C6005700E5 /* QuickSlotTableView.swift */,
+				DEF0763C2AA48125005700E5 /* QuickSlotCell.swift */,
+				DEF076422AA48AF0005700E5 /* QuickSlotCellDeleteButton.swift */,
+				DEF0763F2AA4845E005700E5 /* QuickSlotCellManager.swift */,
+			);
+			path = Table;
+			sourceTree = "<group>";
+		};
 		DEF749302A85655E00D987C8 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -840,7 +860,6 @@
 				DE7F9D462A9B7A4700F8ACAE /* QuickSlotButtonViewItem.xib in Resources */,
 				DEB862D92A852C4500278FCD /* brewInGoinfre.sh in Resources */,
 				DE62BE5A2A9BA31700D97E06 /* QuickSlotButtonCollectionViewController.xib in Resources */,
-				D65C5C7C2AA195AB00BD291A /* prefsHelper.app in Resources */,
 				DE018BE02A509B0600FF0AA3 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -862,6 +881,7 @@
 				DE874F542A591F1400FC3B77 /* PreferencesView.swift in Sources */,
 				DE98E83B2A98DB6000F8744A /* RotateImage+NSImage.swift in Sources */,
 				DE0A91982A8F977F00D1D6F1 /* ToolbarViewController.swift in Sources */,
+				DEF076432AA48AF0005700E5 /* QuickSlotCellDeleteButton.swift in Sources */,
 				DE9DA8142A97F20E001C0D3B /* ButtonGroupViewController.swift in Sources */,
 				DE4408082A9240300091937A /* BoxFunctionButtonView.swift in Sources */,
 				DE3FF3742A978AB8009C88EF /* WindowMaximizeButton.swift in Sources */,
@@ -883,6 +903,8 @@
 				DE77BBF02A9E38C6006CC98B /* GetUserProfile.swift in Sources */,
 				DEF749322A85657600D987C8 /* NSScreen.swift in Sources */,
 				DE018BF02A509B2F00FF0AA3 /* MenubarViewController.swift in Sources */,
+				DEF0763A2AA480C6005700E5 /* QuickSlotTableView.swift in Sources */,
+				DEF076362AA47FDB005700E5 /* QuickSlotManagerViewController.swift in Sources */,
 				DE94571C2A9EFB7800B0B768 /* Associated+NSButton.swift in Sources */,
 				DE6332E42A9BB8F800DCFAF6 /* QuickSlotButtonCollectionViewController.swift in Sources */,
 				DE9457062A9E69C100B0B768 /* ScriptNameLabel.swift in Sources */,
@@ -929,13 +951,15 @@
 				DE9457572AA0C5C600B0B768 /* IconSettingView.swift in Sources */,
 				DE0A91672A8E6CA700D1D6F1 /* WebViewManager.swift in Sources */,
 				DE77BBF32A9E38DC006CC98B /* UserManager.swift in Sources */,
+				DEF076402AA4845E005700E5 /* QuickSlotCellManager.swift in Sources */,
 				DE94570C2A9E69EB00B0B768 /* ScriptExcuteButton.swift in Sources */,
 				DE9457162A9E6D3000B0B768 /* ScriptQuickSlotButton.swift in Sources */,
 				DE97CA7F2A9A73A9001073DE /* QuickSlotUI.swift in Sources */,
 				DE4408152A92750D0091937A /* keyDown+Appdelegate.swift in Sources */,
 				DE018BED2A509B2600FF0AA3 /* URLModel.swift in Sources */,
 				DE97CA692A9A6364001073DE /* PixelConversion+CGFloat.swift in Sources */,
 				DE7886282A9D186700FE21DD /* ScriptsViewController.swift in Sources */,
+				DEF0763D2AA48125005700E5 /* QuickSlotCell.swift in Sources */,
 				DE4408052A923EC00091937A /* QuitButtonView.swift in Sources */,
 				DE0A918A2A8F88A900D1D6F1 /* GoForwardInToolbar.swift in Sources */,
 				DE1F1A1E2A8B50C500A88DD8 /* BoxButtonViewGroup.swift in Sources */,

Box42/Main/BoxBaseContainerViewController.swift

@@ -25,7 +25,7 @@ class BoxBaseContainerViewController: NSViewController {
 
     weak var menubarVCDelegate: MenubarViewControllerDelegate? // extension
 
-
+    var quickSlotManagerVC: QuickSlotManagerViewController = QuickSlotManagerViewController()
     var quickSlotButtonCollectionVC: QuickSlotButtonCollectionViewController =  QuickSlotButtonCollectionViewController()
 
 
@@ -47,6 +47,8 @@ class BoxBaseContainerViewController: NSViewController {
         self.view.layer?.backgroundColor = NSColor(hex: "#E7E7E7").cgColor
 
         NotificationCenter.default.addObserver(self, selector: #selector(handleButtonTapped), name: .collectionButtonTapped, object: nil)
+
+        NotificationCenter.default.addObserver(self, selector: #selector(headerTappedQuickSlotManagerHandle), name: .collectionHeaderTapped, object: nil)
     }
 
     func BoxButtonViewGroupInit() -> BoxButtonViewGroup {
@@ -210,3 +212,15 @@ extension BoxBaseContainerViewController {
         }
     }
 }
+
+extension BoxBaseContainerViewController {
+    @objc func headerTappedQuickSlotManagerHandle(notification: NSNotification) {
+        print("QuickSlotManager")
+        contentGroup.removeAllSubviews()
+        print(quickSlotManagerVC)
+        contentGroup.addSubview(quickSlotManagerVC.view)
+        quickSlotManagerVC.view.snp.makeConstraints { make in
+            make.top.bottom.left.right.equalToSuperview()
+        }
+    }
+}

Box42/QuickSlot/Controller/QuickSlotManagerViewController.swift

@@ -0,0 +1,37 @@
+//
+//  QuickSlotManagerViewController.swift
+//  Box42
+//
+//  Created by Chanhee Kim on 9/3/23.
+//
+
+import AppKit
+
+class QuickSlotManagerViewController: NSViewController {
+    var quickSlotManagerTableView: QuickSlotTableView?
+    var viewModel: QuickSlotViewModel? = QuickSlotViewModel.shared {
+        didSet {
+            quickSlotManagerTableView?.viewModel = viewModel
+        }
+    }
+
+    override func loadView() {
+        self.view = NSView()
+
+        quickSlotManagerTableView = QuickSlotTableView(frame: .zero)
+        quickSlotManagerTableView?.setup()
+        quickSlotManagerTableView?.viewModel = viewModel
+
+        let scrollView = NSScrollView()
+        scrollView.documentView = quickSlotManagerTableView
+        self.view.addSubview(scrollView)
+
+        scrollView.snp.makeConstraints({ make in
+            make.edges.equalToSuperview()
+        })
+
+        quickSlotManagerTableView?.snp.makeConstraints({ make in
+            make.edges.equalToSuperview()
+        })
+    }
+}

Box42/QuickSlot/Controller/QuickSlotViewController.swift

@@ -21,7 +21,7 @@ class QuickSlotViewController: NSViewController {
     }
 
     func headerAction() {
-        print("quick slot header")
+        NotificationCenter.default.post(name: .collectionHeaderTapped, object: nil)
     }
 
     @objc func handleButtonTapped(notification: NSNotification) {

Box42/QuickSlot/Model/QuickSlotButtonModel.swift

@@ -18,8 +18,8 @@ struct QuickSlotButtonModel: Codable {
     var path: String?
     var type: String?
 
-    init(id: UUID = UUID(), title: String = "Default", path: String? = "none", type: String = "sh") {
-        self.scriptUuid = id
+    init(scriptUuid: UUID? = UUID(), title: String = "Default", path: String? = "none", type: String = "sh") {
+        self.scriptUuid = scriptUuid ?? UUID()
         self.title = title
         self.path = path
         self.type = type

Box42/QuickSlot/View/ButtonCollectionView/QuickSlotButtonCollectionViewController.swift

@@ -88,8 +88,13 @@ extension QuickSlotButtonCollectionViewController: NSCollectionViewDelegate, NSC
 
     func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
         let item = collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "QuickSlotButtonViewItem"), for: indexPath)
-
+        print("current item index>", indexPath.item)
         if let customItem = item as? QuickSlotButtonViewItem {
+
+            for subview in customItem.view.subviews {
+                subview.removeFromSuperview()
+            }
+
             if customItem.view.subviews.isEmpty {
                 let btn = QuickSlotItemButton(indexPath.item)
                 btn.action = #selector(collectionButtonTapped)
@@ -123,4 +128,5 @@ extension QuickSlotButtonCollectionViewController {
 // MARK: - Notification Name collectionButtonTapped
 extension Notification.Name {
     static let collectionButtonTapped = Notification.Name("collectionButtonTapped")
+    static let collectionHeaderTapped = Notification.Name("collectionHeaderTapped")
 }

Box42/QuickSlot/View/ButtonCollectionView/Vertical Item/QuickSlotItemButton.swift

@@ -22,6 +22,10 @@ class QuickSlotItemButton: NSButton {
             self.image = NSImage(imageLiteralResourceName: "document-text")
         } else if buttonModel.type == "pref" {
             self.image = NSImage(imageLiteralResourceName: "setting")
+        } else if buttonModel.type == "default-sh" {
+            self.image = NSImage(imageLiteralResourceName: "document-text")
+        } else if buttonModel.type == "default-pref" {
+            self.image = NSImage(imageLiteralResourceName: "setting")
         }
         self.isBordered = false
         self.wantsLayer = true

Box42/QuickSlot/View/QuickSlotGroupView.swift

@@ -11,7 +11,7 @@ import SnapKit
 class QuickSlotGroupView: NSView {
 
     lazy var divider: NSBox = Divider(completion: { [weak self] in self?.dividerAction?() })
-    lazy var headerView: QuickSlotHeaderView = QuickSlotHeaderView(image: NSImage(imageLiteralResourceName: "Star"), completion: { [weak self] in self?.headerAction?() })
+    lazy var headerView: QuickSlotHeaderView = QuickSlotHeaderView(image: NSImage(imageLiteralResourceName: "star"), completion: { [weak self] in self?.headerAction?() })
     lazy var buttonCollectionView: QuickSlotButtonCollectionViewController = QuickSlotButtonCollectionViewController()
 
     var dividerAction: (() -> Void)?

Box42/QuickSlot/View/QuickSlotHeaderView.swift

@@ -11,37 +11,51 @@ import SnapKit
 class QuickSlotHeaderView: NSView {
 
     private var callback: (() -> Void)?
-    private var QuickSlotHeaderButton: NSButton!
-    private var QuickSlotHeaderLabel: NSTextField!
+    private var quickSlotHeaderButton: NSButton!
+    private var quickSlotHeaderLabel: NSTextField!
+    private var quickSlotManageButton: NSButton!
 
     init(image: NSImage, completion: @escaping () -> Void) {
         super.init(frame: .zero)
 
-        QuickSlotHeaderButton = NSButton(image: image, target: self, action: #selector(btnAction))
-        QuickSlotHeaderButton.isBordered = false
-        QuickSlotHeaderButton.wantsLayer = true
-        QuickSlotHeaderButton.layer?.backgroundColor = NSColor.clear.cgColor
+        quickSlotHeaderButton = NSButton(image: image, target: self, action: #selector(btnAction))
+        quickSlotHeaderButton.isBordered = false
+        quickSlotHeaderButton.wantsLayer = true
+        quickSlotHeaderButton.layer?.backgroundColor = NSColor.clear.cgColor
 
-        self.addSubview(QuickSlotHeaderButton)
+        self.addSubview(quickSlotHeaderButton)
 
-        QuickSlotHeaderLabel = NSTextField(labelWithString: "Quick Slot")
-        QuickSlotHeaderLabel.font = NSFont(name: "Inter", size: QuickSlotUI.size.font)
-        QuickSlotHeaderLabel.textColor = NSColor(hex: "#696969")
-        QuickSlotHeaderLabel.backgroundColor = NSColor.clear
-        QuickSlotHeaderLabel.isBordered = false
+        quickSlotHeaderLabel = NSTextField(labelWithString: "Quick Slot")
+        quickSlotHeaderLabel.font = NSFont(name: "Inter", size: QuickSlotUI.size.font)
+        quickSlotHeaderLabel.textColor = NSColor(hex: "#696969")
+        quickSlotHeaderLabel.backgroundColor = NSColor.clear
+        quickSlotHeaderLabel.isBordered = false
 
-        self.addSubview(QuickSlotHeaderLabel)
+        self.addSubview(quickSlotHeaderLabel)
 
-        QuickSlotHeaderButton.snp.makeConstraints { make in
+        quickSlotManageButton = NSButton(image: NSImage(imageLiteralResourceName: "add"), target: self, action: #selector(btnAction))
+        quickSlotManageButton.isBordered = false
+        quickSlotManageButton.wantsLayer = true
+        quickSlotManageButton.layer?.backgroundColor = NSColor.clear.cgColor
+
+        self.addSubview(quickSlotManageButton)
+
+        quickSlotHeaderButton.snp.makeConstraints { make in
             make.left.equalToSuperview()
             make.top.equalToSuperview().offset(13)
         }
 
-        QuickSlotHeaderLabel.snp.makeConstraints { make in
-            make.left.equalTo(QuickSlotHeaderButton.snp.right).offset(4)
-            make.bottom.equalTo(QuickSlotHeaderButton.snp.bottom)
+        quickSlotHeaderLabel.snp.makeConstraints { make in
+            make.left.equalTo(quickSlotHeaderButton.snp.right).offset(4)
+            make.bottom.equalTo(quickSlotHeaderButton.snp.bottom)
+        }
+
+        quickSlotManageButton.snp.makeConstraints { make in
+            make.right.equalToSuperview()
+            make.bottom.equalTo(quickSlotHeaderLabel.snp.bottom)
         }
 
+
         self.callback = completion
     }