From 5c8a37dbca150f8fcffbe9fdc8f47c7390471bd7 Mon Sep 17 00:00:00 2001 From: chanhihi Date: Wed, 30 Aug 2023 20:07:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20reso?= =?UTF-8?q?urce=EB=AA=85=EC=9D=84=20=EB=B3=80=EA=B2=BD=ED=95=A9=EB=8B=88?= =?UTF-8?q?=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uibuttons/Bookmark.imageset/Contents.json | 2 +- .../uibuttons/Star.imageset/Contents.json | 2 +- .../Star.imageset/{Star 3.png => star.png} | Bin 3 files changed, 2 insertions(+), 2 deletions(-) rename Box42/Resources/Assets.xcassets/uibuttons/Star.imageset/{Star 3.png => star.png} (100%) 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 From f01efd50be758fda2e0669cd2974ed02f9e8c4ef Mon Sep 17 00:00:00 2001 From: chanhihi Date: Wed, 30 Aug 2023 20:07:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=ED=95=80=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=8B=9C=20image=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FunctionButton/BoxFunctionViewController.swift | 13 ++++++++++--- Box42/FunctionButton/View/PinButtonView.swift | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) 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?() }