-
Notifications
You must be signed in to change notification settings - Fork 1
Style/#370 마이페이지 수정사항 반영 #379
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
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
3e49f1c
setting: 프로파일 업데이트
dev-domo 0335e20
style: #370 차단 사용자 목록 뷰 구현
dev-domo 151e76a
feat: #370 사용자 차단 관련 뷰모델 생성
dev-domo 27af205
refactor: #370 차단한 사용자 목록으로 이동하는 메서드 추가
dev-domo ff451c1
refactor: #370 마이페이지에 참여하기, 관리 기능 추가
dev-domo 407f6f0
refactor: #370 모달 타입 추가
dev-domo 59f15ee
refactor: #370 오픈채팅방 및 인스타그램 링크 연결
dev-domo f2fa865
style: #370 타로카드 이미지 세팅
dev-domo d036cdb
refactor: #370 뒤로가기 기능 추가
dev-domo cc0841c
refactor: #370 헤더 높이 수정
dev-domo 4aaed7a
refactor: #370 MyPageFeatureView 생성자 수정
dev-domo ff63f38
refactor: #370 마이페이지 기능 목록을 MyPageFeaturesView으로 분리
dev-domo 174639c
refactor: #370 마이페이지 재진입 시에도 이전 진입에서의 스크롤 위치 유지
dev-domo 2782f0e
Merge remote-tracking branch 'origin/develop' into develop
dev-domo 68b1bcd
Merge branch 'develop' into style/#370-myPage
dev-domo a917b71
refactor: #370 문자열 리터럴 -> UITableViewCell의 identifier 사용
dev-domo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/View/BlockedUserCell.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // | ||
| // BlockUserListView.swift | ||
| // ByeBoo-iOS | ||
| // | ||
| // Created by APPLE on 2/22/26. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| final class BlockedUserCell: UITableViewCell { | ||
|
|
||
| private let userNameLabel = UILabel() | ||
| private(set) var clearButton = UIButton() | ||
|
|
||
| override init( | ||
| style: UITableViewCell.CellStyle, | ||
| reuseIdentifier: String? | ||
| ) { | ||
| super.init(style: style, reuseIdentifier: reuseIdentifier) | ||
|
|
||
| setStyle() | ||
| setUI() | ||
| setLayout() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| private func setStyle() { | ||
| self.do { | ||
| $0.backgroundColor = .grayscale900 | ||
| $0.selectionStyle = .none | ||
| } | ||
| userNameLabel.applyByeBooFont( | ||
| style: .body2M16, | ||
| color: .grayscale100 | ||
| ) | ||
| clearButton.do { | ||
| $0.setTitle("해제", for: .normal) | ||
| $0.applyByeBooFont(style: .cap1M12, color: .grayscale100) | ||
| $0.backgroundColor = UIColor.white.withAlphaComponent(0.05) | ||
| $0.layer.borderWidth = 1 | ||
| $0.layer.borderColor = UIColor.grayscale800.cgColor | ||
| $0.layer.cornerRadius = 12 | ||
| } | ||
| } | ||
|
|
||
| private func setUI() { | ||
| contentView.addSubviews( | ||
| userNameLabel, | ||
| clearButton | ||
| ) | ||
| } | ||
|
|
||
| private func setLayout() { | ||
| userNameLabel.snp.makeConstraints { | ||
| $0.leading.equalToSuperview().inset(24.adjustedW) | ||
| $0.verticalEdges.equalToSuperview() | ||
| $0.centerY.equalToSuperview() | ||
| } | ||
| clearButton.snp.makeConstraints { | ||
| $0.trailing.equalToSuperview().inset(24.adjustedW) | ||
| $0.verticalEdges.equalToSuperview() | ||
| $0.centerY.equalTo(userNameLabel.snp.centerY) | ||
| $0.width.equalTo(56.adjustedW) | ||
| $0.height.equalTo(24.adjustedH) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension BlockedUserCell { | ||
|
|
||
| func bind(userName: String) { | ||
| userNameLabel.text = userName | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/View/BlockedUserListView.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| // | ||
| // BlockUserListView.swift | ||
| // ByeBoo-iOS | ||
| // | ||
| // Created by APPLE on 2/22/26. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| final class BlockedUserListView: BaseView { | ||
|
|
||
| private(set) var userTableView = UITableView() | ||
|
|
||
| override func setStyle() { | ||
| self.do { | ||
| $0.backgroundColor = .grayscale900 | ||
| } | ||
| userTableView.do { | ||
| $0.backgroundColor = .grayscale900 | ||
| } | ||
| } | ||
|
|
||
| override func setUI() { | ||
| addSubview(userTableView) | ||
| } | ||
|
|
||
| override func setLayout() { | ||
| userTableView.snp.makeConstraints { | ||
| $0.top.equalToSuperview().inset(12.adjustedH) | ||
| $0.horizontalEdges.equalToSuperview() | ||
| $0.bottom.equalToSuperview().inset(24.adjustedH) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/View/MyPageFeaturesView.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // | ||
| // MyPageFeaturesView.swift | ||
| // ByeBoo-iOS | ||
| // | ||
| // Created by APPLE on 2/25/26. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| final class MyPageFeaturesView: BaseView { | ||
|
|
||
| private(set) var inquireView = MyPageFeatureView(type: .inquire) | ||
| private(set) var noticeView = MyPageFeatureView(type: .notice) | ||
| private(set) var participantView = MyPageFeatureView(type: .participant) | ||
| private(set) var manageView = MyPageFeatureView(type: .manage) | ||
| private(set) var termAndPolicyView = MyPageFeatureView(type: .termAndPolicy) | ||
| private(set) var accountView = MyPageFeatureView(type: .account) | ||
|
|
||
| override func setUI() { | ||
| addSubviews( | ||
| inquireView, | ||
| noticeView, | ||
| participantView, | ||
| manageView, | ||
| termAndPolicyView, | ||
| accountView | ||
| ) | ||
| } | ||
|
|
||
| override func setLayout() { | ||
| inquireView.snp.makeConstraints { | ||
| $0.top.equalToSuperview() | ||
| $0.horizontalEdges.equalToSuperview() | ||
| } | ||
| noticeView.snp.makeConstraints { | ||
| $0.top.equalTo(inquireView.snp.bottom) | ||
| $0.horizontalEdges.equalToSuperview() | ||
| } | ||
| participantView.snp.makeConstraints { | ||
| $0.top.equalTo(noticeView.snp.bottom) | ||
| $0.horizontalEdges.equalToSuperview() | ||
| } | ||
| manageView.snp.makeConstraints { | ||
| $0.top.equalTo(participantView.snp.bottom) | ||
| $0.horizontalEdges.equalToSuperview() | ||
| } | ||
| termAndPolicyView.snp.makeConstraints { | ||
| $0.top.equalTo(manageView.snp.bottom) | ||
| $0.horizontalEdges.equalToSuperview() | ||
| } | ||
| accountView.snp.makeConstraints { | ||
| $0.top.equalTo(termAndPolicyView.snp.bottom) | ||
| $0.horizontalEdges.equalToSuperview() | ||
| $0.bottom.equalToSuperview() | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
오우 너무 좋네용