Merge pull request #99 from 42Box/cluster_develop

Merge: 2.5 Week Release

Author: chanhihi

Box42.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@ import Cocoa
 
 class ButtonGroupViewController: NSViewController {
     override func loadView() {
-//        let ButtonViewGroup = BoxButtonViewGroup()
+//        let ButtonViewGroup = BoxButtonViewGroup(clickAction: clickAction)
         let ButtonViewGroup = NSView()
         ButtonViewGroup.wantsLayer = true
         ButtonViewGroup.layer?.backgroundColor = NSColor.black.cgColor
@@ -20,6 +20,10 @@ class ButtonGroupViewController: NSViewController {
         super.viewDidLoad()
     }
 
+    func clickAction(_ sender: NSButton?) {
+        print("click Action")
+    }
+    
     func preference() {
         print("preference")
     }

Box42/ButtonGroup/ButtonGroupViewController.swift

@@ -0,0 +1,26 @@
+//
+//  IconController.swift
+//  Box42
+//
+//  Created by Chanhee Kim on 8/30/23.
+//
+
+import Foundation
+
+class IconController {
+    let icon = MenubarViewController()
+    
+    init() {
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(handleUserProfileIconUpdate),
+                                               name: .didUpdateUserProfile,
+                                               object: nil)
+    }
+    
+    @objc private func handleUserProfileIconUpdate() {
+        DispatchQueue.main.async {
+            self.icon.buttonImageChange(UserManager.shared.getUserProfile()?.icon ?? "fox")
+        }
+        print("Icon Changed")
+    }
+}

Box42/Icon/IconController.swift

@@ -9,6 +9,7 @@ import Cocoa
 import SnapKit
 
 class BoxBaseContainerViewController: NSViewController {
+    // MARK: - LeftContainer
     var splitView: BoxBaseSplitView = BoxBaseSplitView()
     var contentGroup: BoxContentsViewGroup = BoxContentsViewGroup()
     var toolbarGroupVC: ToolbarViewController = ToolbarViewController()
@@ -17,6 +18,11 @@ class BoxBaseContainerViewController: NSViewController {
     let windowViewGroupVC: WindowButtonViewController = WindowButtonViewController()
     var leftContainer: MovableContainerView = MovableContainerView()
     var buttonGroupVC: ButtonGroupViewController = ButtonGroupViewController()
+    
+    // MARK: - QuickSlot
+    var preferenceVC: PreferencesViewController = PreferencesViewController()
+    var scriptsVC: ScriptsViewController = ScriptsViewController()
+        
     weak var menubarVCDelegate: MenubarViewControllerDelegate? // extension
 
     override func loadView() {
@@ -32,8 +38,11 @@ class BoxBaseContainerViewController: NSViewController {
 
     override func viewDidLoad() {
         self.view.wantsLayer = true
+        
 //        self.view.layer?.backgroundColor = NSColor(hex: "#FF9548").cgColor
         self.view.layer?.backgroundColor = NSColor(hex: "#E7E7E7").cgColor
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleButtonTapped), name: .collectionButtonTapped, object: nil)
     }
 
     func BoxButtonViewGroupInit() -> BoxButtonViewGroup {
@@ -171,3 +180,29 @@ extension BoxBaseContainerViewController: BoxFunctionViewControllerDelegate {
         clickBtn(sender: "box")
     }
 }
+
+extension BoxBaseContainerViewController {
+    @objc func handleButtonTapped(notification: NSNotification) {
+        if let button = notification.object as? NSButton {
+            if button.title == QuickSlotUI.title.preferences {
+                print("Button with title \(button.title) was tapped in BaseVC")
+                contentGroup.showPreferences()
+            }
+            
+            if button.title == QuickSlotUI.title.scripts {
+                print("Button with title \(button.title) was tapped in BaseVC")
+                contentGroup.showScripts()
+            }
+            
+            if button.title == QuickSlotUI.title.user {
+                print("Button with title \(button.title) was tapped in BaseVC")
+                contentGroup.removeAllSubviews()
+                print(WebViewManager.shared.hostingWebView!)
+                contentGroup.addSubview(WebViewManager.shared.hostingWebView!)
+                WebViewManager.shared.hostingWebView!.snp.makeConstraints { make in
+                    make.top.bottom.left.right.equalToSuperview()
+                }
+            }
+        }
+    }
+}

Box42/Main/BoxBaseContainerViewController.swift

@@ -16,13 +16,15 @@ class StatusBar {
 	var isRunning: Bool
 	var interval: Double
 	var alertCount: Int
-
+    var version: Int
+    
     init() {
         self.statusItem = NSStatusItem()
         self.frames = [NSImage]()
         self.cnt = 0
         self.isRunning = false
         self.interval = 1.0
         self.alertCount = 0
+        self.version = 0
     }
 }

Box42/Menubar/MenubarModel.swift

@@ -13,7 +13,7 @@ class MenubarViewController: NSViewController {
     var statusBarVM = StatusBarViewModel()
     lazy var eventMonitor: EventMonitor = self.setupEventMonitor()
     var boxWindowController: BoxWindowController?
-  
+    
     func menubarViewControllerInit() {
         self.buttonInit()
     }
@@ -47,7 +47,9 @@ class MenubarViewController: NSViewController {
     }
 
     func buttonImageChange(_ img: String) {
+        self.menubarStopRunning()
         statusBarVM.changeStatusBarIcon(img)
+        self.menubarStartRunning()
     }
 
     func buttonActionInit() {
@@ -122,7 +124,7 @@ extension MenubarViewController: MenubarViewControllerDelegate {
                 }
                 window.level = .floating
             }
-                boxWindowController?.showWindow(sender)
+            boxWindowController?.showWindow(sender)
         }
     }
 }

Box42/Menubar/MenubarViewController.swift

@@ -11,6 +11,7 @@ class StatusBarViewModel {
     let cpu: CPU
     let statusBar: StatusBar
     private var currentAnimationWorkItem: DispatchWorkItem?
+    private let scheduleQueue = DispatchQueue(label: "animation.scheduleQueue")
 
     init () {
         self.statusBar = StatusBar.shared
@@ -23,7 +24,13 @@ class StatusBarViewModel {
 
     func changeStatusBarIcon(_ imgName: String) {
         statusBar.frames.removeAll()
-        
+        currentAnimationWorkItem?.cancel()
+        if statusBar.version == Int.max {
+            statusBar.version = 0
+        } else {
+            statusBar.version += 1
+        }
+
         switch imgName {
         case "cat": for i in (0...4) {statusBar.frames.append(NSImage(imageLiteralResourceName: "cat_page\(i)"))}
         case "gon": for i in (1...5) {statusBar.frames.append(NSImage(imageLiteralResourceName: "gon_\(i)"))}
@@ -52,25 +59,34 @@ class StatusBarViewModel {
             self.animate()
         }
     }
-    
-    func scheduleAnimation() {
-        currentAnimationWorkItem?.cancel()
 
-        let workItem = DispatchWorkItem { [weak self] in
-            self?.statusBar.statusItem.button?.image = self?.statusBar.frames[self?.statusBar.cnt ?? 0]
-            self?.statusBar.cnt = ((self?.statusBar.cnt)! + 1) % (self?.statusBar.frames.count ?? 1)
+    func scheduleAnimation() {
+        scheduleQueue.sync {
+            currentAnimationWorkItem?.cancel()
 
-            if self?.statusBar.isRunning ?? false {
-                self?.scheduleAnimation()
+            let currentVersion = statusBar.version
+
+            let workItem = DispatchWorkItem { [weak self] in
+                guard self?.statusBar.version == currentVersion else { return }
+                
+                self?.statusBar.statusItem.button?.image = self?.statusBar.frames[self?.statusBar.cnt ?? 0]
+                
+                if let cnt = self?.statusBar.cnt, let framesCount = self?.statusBar.frames.count {
+                    self?.statusBar.cnt = (cnt + 1) % framesCount
+                }
+                
+                if self?.statusBar.isRunning ?? false {
+                    self?.scheduleAnimation()
+                }
             }
+            
+            currentAnimationWorkItem = workItem
+            DispatchQueue.main.asyncAfter(deadline: .now() + statusBar.interval, execute: workItem)
         }
-
-        currentAnimationWorkItem = workItem
-        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + statusBar.interval, execute: workItem)
     }
-    
+
     func stopRunning() {
-        statusBar.isRunning = cpu.StopCPU()
+        statusBar.isRunning = cpu.stopCPU()
         currentAnimationWorkItem?.cancel()
         statusBar.cnt = 0
     }

Box42/Menubar/MenubarViewModel.swift

@@ -48,10 +48,6 @@ class PreferencesViewController: NSViewController {
 
         var stackBox: [NSView] = []
 
-        let icons = iconModel().icon
-        icons.forEach { (icon) in
-            stackBox.append(NSButton(title: "Change \(icon) Icon", target: self, action: #selector(changeIconButtonPressed)))
-        }
 
         let scripts = Scripts().info
         scripts.forEach { (script) in

Box42/Preferences/Icon.swift

@@ -12,16 +12,16 @@ class ScriptsLogicController {
     static let shared = ScriptsLogicController()
 
     private init() {
-        NotificationCenter.default.addObserver(self, selector: #selector(handleButtonTapped), name: NSNotification.Name(NotifConst.object.collectionButtonTapped), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleButtonTapped), name: .collectionButtonTapped, object: nil)
     }
 
     @objc func handleButtonTapped(notification: NSNotification) {
         if let button = notification.object as? NSButton {
-            let buttonTitle = button.title // 메인 스레드에서 타이틀을 캡쳐
+            let buttonTitle = button.title
             print("Button with title \(buttonTitle) was tapped")
 
             DispatchQueue.global(qos: .background).async { [weak self] in
-                if buttonTitle == "clean" {
+                if buttonTitle == QuickSlotUI.title.clean {
                     self?.executeCleanScript()
                 }
             }
@@ -53,5 +53,4 @@ class ScriptsLogicController {
             }
         }
     }
-
 }