Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge: Second Week Release #83

Merged
merged 36 commits into from
Aug 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
891aefa
fix: toolbarView의 어색한 구조 변경.
chanhihi Aug 22, 2023
6ae3e21
refactor: toolbarVC와 toolbarView의 clean architecure를 지향합니다.
chanhihi Aug 22, 2023
3538c03
feat: window toolbar를 커스텀으로 개발합니다.
chanhihi Aug 22, 2023
f913310
chore: 강제언랩핑을 해제합니다.
chanhihi Aug 22, 2023
a9be17d
chore: box 프론트 배포가 https가 가능해짐으로써 수정합니다.
chanhihi Aug 22, 2023
4992e50
refactor: refactoring to NSTable with NSbuttons. (#71)
Aug 23, 2023
ca20037
Merge pull request #57 from 42Box/49-toolbar-group-view-controller
chanhihi Aug 23, 2023
0eca2ea
fix: WebView 자동완성시 layer가 사라지던 현상 수정
chanhihi Aug 24, 2023
472ddfc
refactor: 구조를 변경합니다.
chanhihi Aug 24, 2023
621bedf
fix: 잘못된 버튼 맵핑을 변경합니다.
chanhihi Aug 24, 2023
606b27b
build: 🛠
chanhihi Aug 24, 2023
2043bb0
feat: UI를 위한 Asset 추가
chanhihi Aug 24, 2023
ae3d209
chore: 필요없는 부분 삭제 및 추가
chanhihi Aug 24, 2023
7437848
fix: window controller로 접속시 컴포넌트를 사용못하던 것 수정
chanhihi Aug 24, 2023
dce80e9
refactor: 구조를 변경합니다.
chanhihi Aug 24, 2023
cc06124
fix: button 배경 투명화
chanhihi Aug 24, 2023
1eedc04
feat: 상단 window 버튼 사용 시 추가 될 것
chanhihi Aug 24, 2023
a6825a2
refactor: code style을 권장되는 방식으로 변경합니다.
chanhihi Aug 24, 2023
69453e6
feat: 현재 디자인에 맞춰서 재조립 하였습니다.
chanhihi Aug 24, 2023
8900553
refactor: code style을 권장되는 방식으로 변경합니다.
chanhihi Aug 24, 2023
8f700c2
feat: 상단아이콘을 Fox로 변경합니다. 🦊
chanhihi Aug 24, 2023
246071b
refactor: 구조를 변경합니다.
chanhihi Aug 24, 2023
a621514
Merge pull request #75 from 42Box/74-click-event
chanhihi Aug 24, 2023
f8824d6
fix: pin button 디자인 변경 (#78)
chanhihi Aug 26, 2023
96fd476
fix: function button 겹치던것 수정
chanhihi Aug 26, 2023
25a439b
feat: 🦊 window buttond (#81)
chanhihi Aug 26, 2023
4efefcd
feat: UI를 위한 asset을 추가합니다.
chanhihi Aug 26, 2023
b158979
feat: 기본적인 UI frame을 구성합니다.
chanhihi Aug 26, 2023
f95ec59
feat: collection view 등록.
chanhihi Aug 26, 2023
c7b0bae
refactor(const): 상수값을 enum으로 변경하였습니다.
chanhihi Aug 27, 2023
3206686
style: 🦊
chanhihi Aug 27, 2023
9cb68a3
feat(collectionView): xib로 collection view를 진행합니다.
chanhihi Aug 27, 2023
172d06f
feat: NotificationCenter로 QuickSlot의 Button Action을 관리합니다.
chanhihi Aug 27, 2023
e4b9a75
feat: QuickSlotGroup의 뷰를 구성합니다.
chanhihi Aug 27, 2023
466ed6c
feat(mvvm): quick slot view와 view model을 mvvm구조로 구성합니다.
chanhihi Aug 27, 2023
e860578
Merge pull request #82 from 42Box/79-quick-slot
chanhihi Aug 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 200 additions & 29 deletions Box42.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

129 changes: 0 additions & 129 deletions Box42/Box/BoxBaseContainerViewController.swift

This file was deleted.

92 changes: 0 additions & 92 deletions Box42/Box/View/BoxButtonViewGroup.swift

This file was deleted.

44 changes: 44 additions & 0 deletions Box42/BoxWindowController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// BoxWindowController.swift
// Box42
//
// Created by Chanhee Kim on 8/11/23.
//

import Cocoa

class BoxWindowController: NSWindowController, NSWindowDelegate {
override init(window: NSWindow?) {
let contentRect = BoxSizeManager.shared.boxViewSizeNSRect
let styleMask: NSWindow.StyleMask = [.resizable, .titled, .fullSizeContentView]
let windowInstance = NSWindow(contentRect: contentRect, styleMask: styleMask, backing: .buffered, defer: false)
super.init(window: windowInstance)
windowInstance.delegate = self

windowInstance.title = "Box"
windowInstance.titlebarAppearsTransparent = true
windowInstance.titleVisibility = .hidden
windowInstance.isMovableByWindowBackground = true
windowInstance.isReleasedWhenClosed = false
windowInstance.standardWindowButton(.closeButton)?.isHidden = true
windowInstance.standardWindowButton(.miniaturizeButton)?.isHidden = true
windowInstance.standardWindowButton(.zoomButton)?.isHidden = true

let boxViewController = BoxBaseContainerViewController(nibName: nil, bundle: nil)
windowInstance.contentViewController = boxViewController
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}

extension BoxWindowController {
func windowWillClose(_ notification: Notification) {
StateManager.shared.showWindow = false
}

func windowWillMiniaturize(_ notification: Notification) {
StateManager.shared.showWindow = false
}
}
Loading