diff --git a/Box42/FunctionButton/BoxFunctionViewController.swift b/Box42/FunctionButton/BoxFunctionViewController.swift index ea2f9e0..0c1a9b3 100644 --- a/Box42/FunctionButton/BoxFunctionViewController.swift +++ b/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 @@ -30,11 +34,14 @@ class BoxFunctionViewController: NSViewController { func pin() { StateManager.shared.togglePin() + let newImage: NSImage if StateManager.shared.pin { - // image on + newImage = NSImage(imageLiteralResourceName: "pin-box-ver") } else { - // image off + newImage = NSImage(imageLiteralResourceName: "pin-box") } + + pinButtonView?.changePinImage(to: newImage) // 이미지 변경 print("pin") } @@ -44,7 +51,7 @@ class BoxFunctionViewController: NSViewController { } weak var delegate: BoxFunctionViewControllerDelegate? - + func box() { print("box") delegate?.didTapBoxButton() diff --git a/Box42/FunctionButton/View/PinButtonView.swift b/Box42/FunctionButton/View/PinButtonView.swift index 684e3be..9c9db8b 100644 --- a/Box42/FunctionButton/View/PinButtonView.swift +++ b/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?() } diff --git a/Box42/Resources/Assets.xcassets/uibuttons/Bookmark.imageset/Contents.json b/Box42/Resources/Assets.xcassets/uibuttons/Bookmark.imageset/Contents.json index f843e5b..c1d7e62 100644 --- a/Box42/Resources/Assets.xcassets/uibuttons/Bookmark.imageset/Contents.json +++ b/Box42/Resources/Assets.xcassets/uibuttons/Bookmark.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "Bookmark icon.png", + "filename" : "bookmark icon.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/Contents.json b/Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/Contents.json index bad711e..2e47fcd 100644 --- a/Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/Contents.json +++ b/Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "Star 3.png", + "filename" : "star.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/Star 3.png b/Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/star.png similarity index 100% rename from Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/Star 3.png rename to Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/star.png