Merge: 2.7 Week Release

Box42.xcodeproj/project.pbxproj

@@ -68,7 +68,7 @@
 		DE77BA562A82637900713683 /* StateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE77BA552A82637900713683 /* StateManager.swift */; };
 		DE77BBA22A9DDC40006CC98B /* ScriptsFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE77BBA12A9DDC40006CC98B /* ScriptsFileManager.swift */; };
 		DE77BBA62A9DDF2B006CC98B /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE0A91772A8F014F00D1D6F1 /* WebView.swift */; };
-		DE77BBCD2A9E0568006CC98B /* ExcuteScripts.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE77BBCC2A9E0568006CC98B /* ExcuteScripts.swift */; };
+		DE77BBCD2A9E0568006CC98B /* ExecuteScripts.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE77BBCC2A9E0568006CC98B /* ExecuteScripts.swift */; };
 		DE77BBD22A9E0AE8006CC98B /* WebViewUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE77BBD12A9E0AE8006CC98B /* WebViewUI.swift */; };
 		DE77BBE22A9E0F70006CC98B /* Scripts.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE77BBE12A9E0F70006CC98B /* Scripts.swift */; };
 		DE77BBF02A9E38C6006CC98B /* GetUserProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE77BBA92A9DE680006CC98B /* GetUserProfile.swift */; };
@@ -90,6 +90,14 @@
 		DE94570C2A9E69EB00B0B768 /* ScriptExcuteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE94570B2A9E69EB00B0B768 /* ScriptExcuteButton.swift */; };
 		DE94570F2A9E69F200B0B768 /* ScriptDeleteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE94570E2A9E69F200B0B768 /* ScriptDeleteButton.swift */; };
 		DE9457162A9E6D3000B0B768 /* ScriptQuickSlotButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9457112A9E6A0000B0B768 /* ScriptQuickSlotButton.swift */; };
+		DE9457192A9EEEF000B0B768 /* ScriptCellManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9457182A9EEEF000B0B768 /* ScriptCellManager.swift */; };
+		DE94571C2A9EFB7800B0B768 /* Associated+NSButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE94571B2A9EFB7800B0B768 /* Associated+NSButton.swift */; };
+		DE9457282A9F6E4400B0B768 /* GetUserMeScripts.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9457272A9F6E4400B0B768 /* GetUserMeScripts.swift */; };
+		DE94572C2A9F75D500B0B768 /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE94572B2A9F75D500B0B768 /* API.swift */; };
+		DE9457312A9FB01400B0B768 /* PreferencesTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9457302A9FB01400B0B768 /* PreferencesTableView.swift */; };
+		DE9457342A9FB1D300B0B768 /* RequestAccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9457332A9FB1D300B0B768 /* RequestAccessView.swift */; };
+		DE9457372A9FC0A800B0B768 /* SecurityScopedResourceAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9457362A9FC0A800B0B768 /* SecurityScopedResourceAccess.swift */; };
+		DE94573D2A9FD33400B0B768 /* StorageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE94573C2A9FD33400B0B768 /* StorageView.swift */; };
 		DE97CA692A9A6364001073DE /* PixelConversion+CGFloat.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE97CA682A9A6364001073DE /* PixelConversion+CGFloat.swift */; };
 		DE97CA792A9A6F6A001073DE /* QuickSlotHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE97CA782A9A6F6A001073DE /* QuickSlotHeaderView.swift */; };
 		DE97CA7C2A9A7199001073DE /* QuickSlotGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE97CA7B2A9A7199001073DE /* QuickSlotGroupView.swift */; };
@@ -171,7 +179,7 @@
 		DE77BA552A82637900713683 /* StateManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StateManager.swift; sourceTree = "<group>"; };
 		DE77BBA12A9DDC40006CC98B /* ScriptsFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptsFileManager.swift; sourceTree = "<group>"; };
 		DE77BBA92A9DE680006CC98B /* GetUserProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetUserProfile.swift; sourceTree = "<group>"; };
-		DE77BBCC2A9E0568006CC98B /* ExcuteScripts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExcuteScripts.swift; sourceTree = "<group>"; };
+		DE77BBCC2A9E0568006CC98B /* ExecuteScripts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExecuteScripts.swift; sourceTree = "<group>"; };
 		DE77BBD12A9E0AE8006CC98B /* WebViewUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewUI.swift; sourceTree = "<group>"; };
 		DE77BBE12A9E0F70006CC98B /* Scripts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Scripts.swift; sourceTree = "<group>"; };
 		DE77BBE92A9E2DDF006CC98B /* UserManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserManager.swift; sourceTree = "<group>"; };
@@ -193,6 +201,14 @@
 		DE94570B2A9E69EB00B0B768 /* ScriptExcuteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptExcuteButton.swift; sourceTree = "<group>"; };
 		DE94570E2A9E69F200B0B768 /* ScriptDeleteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptDeleteButton.swift; sourceTree = "<group>"; };
 		DE9457112A9E6A0000B0B768 /* ScriptQuickSlotButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptQuickSlotButton.swift; sourceTree = "<group>"; };
+		DE9457182A9EEEF000B0B768 /* ScriptCellManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptCellManager.swift; sourceTree = "<group>"; };
+		DE94571B2A9EFB7800B0B768 /* Associated+NSButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Associated+NSButton.swift"; sourceTree = "<group>"; };
+		DE9457272A9F6E4400B0B768 /* GetUserMeScripts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetUserMeScripts.swift; sourceTree = "<group>"; };
+		DE94572B2A9F75D500B0B768 /* API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
+		DE9457302A9FB01400B0B768 /* PreferencesTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesTableView.swift; sourceTree = "<group>"; };
+		DE9457332A9FB1D300B0B768 /* RequestAccessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestAccessView.swift; sourceTree = "<group>"; };
+		DE9457362A9FC0A800B0B768 /* SecurityScopedResourceAccess.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityScopedResourceAccess.swift; sourceTree = "<group>"; };
+		DE94573C2A9FD33400B0B768 /* StorageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageView.swift; sourceTree = "<group>"; };
 		DE97CA682A9A6364001073DE /* PixelConversion+CGFloat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PixelConversion+CGFloat.swift"; sourceTree = "<group>"; };
 		DE97CA6E2A9A6EFC001073DE /* QuickSlotViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotViewModel.swift; sourceTree = "<group>"; };
 		DE97CA712A9A6F0D001073DE /* QuickSlotButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotButtonModel.swift; sourceTree = "<group>"; };
@@ -420,6 +436,7 @@
 				DE1F1A282A8B50E200A88DD8 /* BoxSizeManager.swift */,
 				DE77BA552A82637900713683 /* StateManager.swift */,
 				DE0A91622A8E6A5400D1D6F1 /* Constants.swift */,
+				DE9457362A9FC0A800B0B768 /* SecurityScopedResourceAccess.swift */,
 			);
 			path = Shared;
 			sourceTree = "<group>";
@@ -428,6 +445,8 @@
 			isa = PBXGroup;
 			children = (
 				DE77BBA92A9DE680006CC98B /* GetUserProfile.swift */,
+				DE9457272A9F6E4400B0B768 /* GetUserMeScripts.swift */,
+				DE94572B2A9F75D500B0B768 /* API.swift */,
 			);
 			path = API;
 			sourceTree = "<group>";
@@ -496,7 +515,7 @@
 			children = (
 				DE0A917A2A8F0CA800D1D6F1 /* AppleScripts+ShowMessage.swift */,
 				DE77BBA12A9DDC40006CC98B /* ScriptsFileManager.swift */,
-				DE77BBCC2A9E0568006CC98B /* ExcuteScripts.swift */,
+				DE77BBCC2A9E0568006CC98B /* ExecuteScripts.swift */,
 				DE7886272A9D186700FE21DD /* ScriptsViewController.swift */,
 			);
 			path = Controller;
@@ -505,7 +524,8 @@
 		DE78862B2A9D1A9E00FE21DD /* View */ = {
 			isa = PBXGroup;
 			children = (
-				DE78862C2A9D1ADE00FE21DD /* PreferencesCell.swift */,
+				DE9457412A9FD69800B0B768 /* Table */,
+				DE94573F2A9FD68C00B0B768 /* Funtion */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -528,8 +548,7 @@
 				DE2AD3282A824EEB00002D51 /* Accessibility.swift */,
 				DE874F4D2A591DEA00FC3B77 /* Hotkey.swift */,
 			);
-			name = Preferences;
-			path = QuickSlot/Preferences;
+			path = Preferences;
 			sourceTree = "<group>";
 		};
 		DE9456F62A9E44F100B0B768 /* Icon */ = {
@@ -566,6 +585,25 @@
 			children = (
 				DE7886032A9C71CB00FE21DD /* ScriptsTableView.swift */,
 				DE9456FF2A9E5B0900B0B768 /* ScriptCell.swift */,
+				DE9457182A9EEEF000B0B768 /* ScriptCellManager.swift */,
+			);
+			path = Table;
+			sourceTree = "<group>";
+		};
+		DE94573F2A9FD68C00B0B768 /* Funtion */ = {
+			isa = PBXGroup;
+			children = (
+				DE9457332A9FB1D300B0B768 /* RequestAccessView.swift */,
+				DE94573C2A9FD33400B0B768 /* StorageView.swift */,
+			);
+			path = Funtion;
+			sourceTree = "<group>";
+		};
+		DE9457412A9FD69800B0B768 /* Table */ = {
+			isa = PBXGroup;
+			children = (
+				DE78862C2A9D1ADE00FE21DD /* PreferencesCell.swift */,
+				DE9457302A9FB01400B0B768 /* PreferencesTableView.swift */,
 			);
 			path = Table;
 			sourceTree = "<group>";
@@ -687,6 +725,7 @@
 				DE24E63A2A8FE93900E29F5D /* NSImage.swift */,
 				DE98E83A2A98DB6000F8744A /* RotateImage+NSImage.swift */,
 				DE97CA682A9A6364001073DE /* PixelConversion+CGFloat.swift */,
+				DE94571B2A9EFB7800B0B768 /* Associated+NSButton.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -785,19 +824,23 @@
 				DE4408082A9240300091937A /* BoxFunctionButtonView.swift in Sources */,
 				DE3FF3742A978AB8009C88EF /* WindowMaximizeButton.swift in Sources */,
 				DE3FF3A32A97D2A6009C88EF /* DisplayURLTextfield.swift in Sources */,
+				DE9457192A9EEEF000B0B768 /* ScriptCellManager.swift in Sources */,
 				DE9457002A9E5B0900B0B768 /* ScriptCell.swift in Sources */,
 				DE7886042A9C71CB00FE21DD /* ScriptsTableView.swift in Sources */,
+				DE9457312A9FB01400B0B768 /* PreferencesTableView.swift in Sources */,
 				DE97CA872A9A7407001073DE /* QuickSlotButtonModel.swift in Sources */,
 				DE77BA562A82637900713683 /* StateManager.swift in Sources */,
 				DE1F1A1C2A8B50C500A88DD8 /* BoxBaseContainerViewController.swift in Sources */,
 				DEE0FA962A9A554F00085A65 /* FunctionButtonUI.swift in Sources */,
 				DE018BE72A509B1E00FF0AA3 /* WebViewController.swift in Sources */,
 				DE98E8552A98EA7900F8744A /* WindowButtonUI.swift in Sources */,
 				DE4407FA2A923E860091937A /* BoxFunctionViewController.swift in Sources */,
+				DE94572C2A9F75D500B0B768 /* API.swift in Sources */,
 				DE4407FE2A923EA90091937A /* PreferenceButtonView.swift in Sources */,
 				DE77BBF02A9E38C6006CC98B /* GetUserProfile.swift in Sources */,
 				DEF749322A85657600D987C8 /* NSScreen.swift in Sources */,
 				DE018BF02A509B2F00FF0AA3 /* MenubarViewController.swift in Sources */,
+				DE94571C2A9EFB7800B0B768 /* Associated+NSButton.swift in Sources */,
 				DE6332E42A9BB8F800DCFAF6 /* QuickSlotButtonCollectionViewController.swift in Sources */,
 				DE9457062A9E69C100B0B768 /* ScriptNameLabel.swift in Sources */,
 				DE77BA512A82580400713683 /* MenubarViewModel.swift in Sources */,
@@ -811,22 +854,26 @@
 				DE77BBA62A9DDF2B006CC98B /* WebView.swift in Sources */,
 				DE0A91832A8F889000D1D6F1 /* GoHomePageViaToolbar().swift in Sources */,
 				DE6332F22A9BCA2C00DCFAF6 /* QuickSlotScriptsLogicController.swift in Sources */,
+				DE9457342A9FB1D300B0B768 /* RequestAccessView.swift in Sources */,
 				DE018BB32A5099F900FF0AA3 /* AppDelegate.swift in Sources */,
 				DE78860C2A9C770300FE21DD /* ScriptsViewModel.swift in Sources */,
 				DE0A91632A8E6A5400D1D6F1 /* Constants.swift in Sources */,
 				DE7886172A9CCB3B00FE21DD /* UserProfile.swift in Sources */,
 				DE0A91902A8F88CA00D1D6F1 /* DisplayURLInToolbar.swift in Sources */,
-				DE77BBCD2A9E0568006CC98B /* ExcuteScripts.swift in Sources */,
+				DE77BBCD2A9E0568006CC98B /* ExecuteScripts.swift in Sources */,
 				DE9456F82A9E44FD00B0B768 /* IconController.swift in Sources */,
 				DE018BF32A509B3300FF0AA3 /* MenubarModel.swift in Sources */,
 				DE7A257A2A6D8CA20043225A /* PreferencesViewController.swift in Sources */,
 				DE24E63B2A8FE93900E29F5D /* NSImage.swift in Sources */,
 				DE94570F2A9E69F200B0B768 /* ScriptDeleteButton.swift in Sources */,
 				DE97CA792A9A6F6A001073DE /* QuickSlotHeaderView.swift in Sources */,
+				DE9457372A9FC0A800B0B768 /* SecurityScopedResourceAccess.swift in Sources */,
 				DE0A916D2A8E7DD700D1D6F1 /* HoverButton.swift in Sources */,
 				DE97CA862A9A7404001073DE /* QuickSlotViewModel.swift in Sources */,
 				DE3FF3762A978AB8009C88EF /* WindowCloseButton.swift in Sources */,
 				DE9457092A9E69D100B0B768 /* ScriptDescriptionsLabel.swift in Sources */,
+				DE94573D2A9FD33400B0B768 /* StorageView.swift in Sources */,
+				DE9457282A9F6E4400B0B768 /* GetUserMeScripts.swift in Sources */,
 				DE77BBD22A9E0AE8006CC98B /* WebViewUI.swift in Sources */,
 				DE3FF3772A978AB8009C88EF /* WindowMinimizeButton.swift in Sources */,
 				DE4408022A923EB60091937A /* PinButtonView.swift in Sources */,

Box42/Extensions/Associated+NSButton.swift

@@ -0,0 +1,21 @@
+//
+//  Associated+NSButton.swift
+//  Box42
+//
+//  Created by Chanhee Kim on 8/30/23.
+//
+
+import AppKit
+
+private var AssociatedObjectKey: UInt8 = 0
+
+extension NSButton {
+    var associatedString: String? {
+        get {
+            return objc_getAssociatedObject(self, &AssociatedObjectKey) as? String
+        }
+        set(newValue) {
+            objc_setAssociatedObject(self, &AssociatedObjectKey, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
+    }
+}

Box42/FunctionButton/BoxFunctionViewController.swift

@@ -8,9 +8,13 @@
 import Cocoa
 
 class BoxFunctionViewController: NSViewController {
+
+    var pinButtonView: PinButtonView?
+
     override func loadView() {
         let functionViewGroup = BoxFunctionViewGroup()
 
+        pinButtonView = functionViewGroup.pinButton
         functionViewGroup.preferenceAction = preference
         functionViewGroup.pinAction = pin
         functionViewGroup.quitAction = quit
@@ -28,6 +32,16 @@ class BoxFunctionViewController: NSViewController {
     }
 
     func pin() {
+        StateManager.shared.togglePin()
+
+        let newImage: NSImage
+        if StateManager.shared.pin {
+            newImage = NSImage(imageLiteralResourceName: "pin-box-ver")
+        } else {
+            newImage = NSImage(imageLiteralResourceName: "pin-box")
+        }
+
+        pinButtonView?.changePinImage(to: newImage)  // 이미지 변경
         print("pin")
     }
 
@@ -37,7 +51,7 @@ class BoxFunctionViewController: NSViewController {
     }
 
     weak var delegate: BoxFunctionViewControllerDelegate?
-
+    
     func box() {
         print("box")
         delegate?.didTapBoxButton()

Box42/FunctionButton/View/PinButtonView.swift

@@ -49,6 +49,10 @@ class PinButtonView: NSView {
         fatalError("init(coder:) has not been implemented")
     }
 
+    func changePinImage(to image: NSImage) {
+        pinBoxButton.image = image
+    }
+
     @objc func pin() {
         callback?()
     }

Box42/Main/keyDown+BoxBaseContainerViewController.swift

@@ -22,6 +22,10 @@ extension BoxBaseContainerViewController {
             StorageConfig.shared.setPeriod(.period1s)
         }
 
+        if event.modifierFlags.contains(.command) && event.keyCode == 15 {
+            print("Cmd + R pressed, reloading...")
+            WebViewManager.shared.hostingWebView?.reload()
+        }
 
         if event.keyCode == 53 { // Escape 키의 keyCode는 53입니다.
             print("escape")

Box42/Preferences/Controller/PreferencesViewController.swift

@@ -0,0 +1,35 @@
+//
+//  PreferencesViewController.swift
+//  Box42
+//
+//  Created by Chanhee Kim on 7/24/23.
+//
+
+import Cocoa
+import SnapKit
+
+class PreferencesViewController: NSViewController {
+    var prefTableView : PreferencesTableView?
+
+    override func loadView() {
+        self.view = NSView()
+        self.view.wantsLayer = true
+        self.view.layer?.backgroundColor = NSColor.blue.cgColor
+
+        prefTableView = PreferencesTableView(frame: .zero)
+        prefTableView?.setup()
+//        prefTableView?.viewModel = viewModel
+
+        let scrollView = NSScrollView()
+        scrollView.documentView = prefTableView
+        self.view.addSubview(scrollView)
+
+        scrollView.snp.makeConstraints({ make in
+            make.edges.equalToSuperview()
+        })
+
+        prefTableView?.snp.makeConstraints({ make in
+            make.edges.equalToSuperview()
+        })
+    }
+}