From 185955415545b1e653ecb4e532f6d000ee55a7ee Mon Sep 17 00:00:00 2001 From: youn9k Date: Tue, 11 Jun 2024 00:03:25 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20[#550]=20BlueGray?= =?UTF-8?q?Color=EB=A1=9C=20=EB=B3=80=EA=B2=BD,=20WMLabel=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FAQ/FaqViewController.swift | 6 +++- .../Notice/NoticeDetailViewController.swift | 4 +-- .../Notice/NoticeViewController.swift | 4 +-- .../OpenSourceLicenseViewController.swift | 4 +-- .../Question/QuestionViewController.swift | 17 ++++++----- .../Request/RequestViewController.swift | 10 +++---- .../ServiceInfoViewController.swift | 4 +-- .../Sources/Views/AppPushSettingView.swift | 12 +++++--- .../Sources/Views/DrawButtonView.swift | 30 +++++++++++-------- .../Sources/Views/LoginWarningView.swift | 14 +++++---- .../Views/NoticeDetailHeaderView.swift | 12 ++++---- .../Sources/Views/NoticeListCell.swift | 6 ++-- .../Sources/Views/OpenSourceLibraryCell.swift | 4 +-- .../Sources/Views/OpenSourceLicenseCell.swift | 4 +-- .../Sources/Views/ProfileView.swift | 25 ++++++++++------ .../Sources/Views/ServiceInfoCell.swift | 4 +-- .../Sources/Views/SettingItemView.swift | 13 ++++---- .../Sources/Views/SettingView.swift | 30 +++++++++++-------- 18 files changed, 118 insertions(+), 85 deletions(-) diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/FAQ/FaqViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/FAQ/FaqViewController.swift index e9d6df9e8..599b8c6fb 100644 --- a/Projects/Features/MyInfoFeature/Sources/ViewControllers/FAQ/FaqViewController.swift +++ b/Projects/Features/MyInfoFeature/Sources/ViewControllers/FAQ/FaqViewController.swift @@ -57,7 +57,11 @@ public final class FaqViewController: TabmanViewController, ViewControllerFromSt extension FaqViewController { private func configureUI() { self.backButton.setImage(DesignSystemAsset.Navigation.back.image, for: .normal) - self.titleLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16) + self.titleLabel.font = .setFont(.t5(weight: .medium)) + self.titleLabel.setTextWithAttributes( + lineHeight: UIFont.WMFontSystem.t5(weight: .medium).lineHeight, + kernValue: -0.5 + ) self.activityIndicator.type = .circleStrokeSpin self.activityIndicator.color = DesignSystemAsset.PrimaryColor.point.color self.activityIndicator.startAnimating() diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeDetailViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeDetailViewController.swift index afae1cf71..4ec464c1b 100644 --- a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeDetailViewController.swift +++ b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeDetailViewController.swift @@ -102,14 +102,14 @@ extension NoticeDetailViewController { } private func configureUI() { - self.view.backgroundColor = DesignSystemAsset.GrayColor.gray100.color + self.view.backgroundColor = DesignSystemAsset.BlueGrayColor.blueGray100.color closeButton.setImage(DesignSystemAsset.Navigation.crossClose.image, for: .normal) let attributedString: NSAttributedString = NSAttributedString( string: "공지사항", attributes: [ .font: DesignSystemFontFamily.Pretendard.medium.font(size: 16), - .foregroundColor: DesignSystemAsset.GrayColor.gray900.color, + .foregroundColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, .kern: -0.5 ] ) diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeViewController.swift index 20ea4dc21..77aa3b280 100644 --- a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeViewController.swift +++ b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeViewController.swift @@ -86,7 +86,7 @@ extension NoticeViewController { } private func configureUI() { - self.view.backgroundColor = DesignSystemAsset.GrayColor.gray100.color + self.view.backgroundColor = DesignSystemAsset.BlueGrayColor.blueGray100.color self.tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: APP_WIDTH(), height: 56)) self.tableView.verticalScrollIndicatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 56, right: 0) self.backButton.setImage(DesignSystemAsset.Navigation.back.image, for: .normal) @@ -94,7 +94,7 @@ extension NoticeViewController { string: "공지사항", attributes: [ .font: DesignSystemFontFamily.Pretendard.medium.font(size: 16), - .foregroundColor: DesignSystemAsset.GrayColor.gray900.color, + .foregroundColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, .kern: -0.5 ] ) diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/OpenSourceLicense/OpenSourceLicenseViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/OpenSourceLicense/OpenSourceLicenseViewController.swift index c610d6f05..fc7a58cd5 100644 --- a/Projects/Features/MyInfoFeature/Sources/ViewControllers/OpenSourceLicense/OpenSourceLicenseViewController.swift +++ b/Projects/Features/MyInfoFeature/Sources/ViewControllers/OpenSourceLicense/OpenSourceLicenseViewController.swift @@ -111,10 +111,10 @@ extension OpenSourceLicenseViewController: UITableViewDelegate { extension OpenSourceLicenseViewController { private func configureUI() { backButton.setImage(DesignSystemAsset.Navigation.back.image, for: .normal) - view.backgroundColor = DesignSystemAsset.GrayColor.gray100.color + view.backgroundColor = DesignSystemAsset.BlueGrayColor.blueGray100.color titleStringLabel.text = "오픈소스 라이선스" titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16) - titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + titleStringLabel.textColor = DesignSystemAsset.BlueGrayColor.blueGray900.color titleStringLabel.setTextWithAttributes(kernValue: -0.5) tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: APP_WIDTH(), height: 56)) tableView.verticalScrollIndicatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 56, right: 0) diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift index 0a580eab1..470031751 100644 --- a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift +++ b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift @@ -33,8 +33,8 @@ public final class QuestionViewController: BaseViewController, ViewControllerFro @IBOutlet weak var nextButton: UIButton! let selectedColor: UIColor = DesignSystemAsset.PrimaryColor.decrease.color - let unSelectedTextColor: UIColor = DesignSystemAsset.GrayColor.gray900.color - let unSelectedColor: UIColor = DesignSystemAsset.GrayColor.gray200.color + let unSelectedTextColor: UIColor = DesignSystemAsset.BlueGrayColor.blueGray900.color + let unSelectedColor: UIColor = DesignSystemAsset.BlueGrayColor.blueGray200.color let disposeBag = DisposeBag() var viewModel: QuestionViewModel! var textPopUpFactory: TextPopUpFactory! @@ -65,7 +65,7 @@ public final class QuestionViewController: BaseViewController, ViewControllerFro extension QuestionViewController { private func configureUI() { self.titleLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16) - self.titleLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + self.titleLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color self.titleLabel.text = "문의하기" self.titleLabel.setTextWithAttributes(kernValue: -0.5) @@ -73,20 +73,20 @@ extension QuestionViewController { self.descriptionLabel.text = "어떤 것 관련해서 문의주셨나요?" self.descriptionLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 20) - self.descriptionLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + self.descriptionLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color self.descriptionLabel.setTextWithAttributes(kernValue: -0.5) self.nextButton.layer.cornerRadius = 12 self.nextButton.clipsToBounds = true self.nextButton.isEnabled = false self.nextButton.setBackgroundColor(DesignSystemAsset.PrimaryColor.point.color, for: .normal) - self.nextButton.setBackgroundColor(DesignSystemAsset.GrayColor.gray300.color, for: .disabled) + self.nextButton.setBackgroundColor(DesignSystemAsset.BlueGrayColor.gray300.color, for: .disabled) self.nextButton.setAttributedTitle( NSMutableAttributedString( string: "다음", attributes: [ .font: DesignSystemFontFamily.Pretendard.medium.font(size: 18), - .foregroundColor: DesignSystemAsset.GrayColor.gray25.color, + .foregroundColor: DesignSystemAsset.BlueGrayColor.gray25.color, .kern: -0.5 ] ), for: .normal @@ -249,9 +249,10 @@ extension QuestionViewController { guard let self = self else { return } if source == .addSong { let link: String = "https://whimsical.com/E3GQxrTaafVVBrhm55BNBS" - + let text = + "· 이세돌 분들이 부르신 걸 이파리분들이 개인 소장용으로 일부 공개한 영상을 올리길 원하시면 ‘왁타버스 뮤직’으로 왁물원 채팅 부탁드립니다.\n· 왁뮤에 들어갈 수 있는 기준을 충족하는지 꼭 확인하시고 추가 요청해 주세요." guard let textPopupViewController = self.textPopUpFactory.makeView( - text: "· 이세돌 분들이 부르신 걸 이파리분들이 개인 소장용으로 일부 공개한 영상을 올리길 원하시면 ‘왁타버스 뮤직’으로 왁물원 채팅 부탁드립니다.\n· 왁뮤에 들어갈 수 있는 기준을 충족하는지 꼭 확인하시고 추가 요청해 주세요.", + text: text, cancelButtonIsHidden: false, allowsDragAndTapToDismiss: nil, confirmButtonText: "다음", diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Request/RequestViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Request/RequestViewController.swift index a2fec0993..b496cc049 100644 --- a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Request/RequestViewController.swift +++ b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Request/RequestViewController.swift @@ -193,7 +193,7 @@ extension RequestViewController { string: title, attributes: [ .font: DesignSystemFontFamily.Pretendard.medium.font(size: 16), - .foregroundColor: DesignSystemAsset.GrayColor.gray900.color, + .foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color, .kern: -0.5 ] ) @@ -201,7 +201,7 @@ extension RequestViewController { superViews[i].backgroundColor = .white.withAlphaComponent(0.4) superViews[i].layer.borderWidth = 1 superViews[i].layer.cornerRadius = 12 - superViews[i].layer.borderColor = DesignSystemAsset.GrayColor.gray200.color.cgColor + superViews[i].layer.borderColor = DesignSystemAsset.BlueGrayColor.gray200.color.cgColor } dotLabel.layer.cornerRadius = 2 @@ -215,14 +215,14 @@ extension RequestViewController { withDrawAttributedString.addAttributes( [ .font: DesignSystemFontFamily.Pretendard.bold.font(size: 12), - .foregroundColor: DesignSystemAsset.GrayColor.gray400.color, + .foregroundColor: DesignSystemAsset.BlueGrayColor.gray400.color, .kern: -0.5 ], range: NSRange(location: 0, length: withDrawAttributedString.string.count) ) withdrawButton.layer.borderWidth = 1 withdrawButton.layer.cornerRadius = 4 - withdrawButton.layer.borderColor = DesignSystemAsset.GrayColor.gray300.color.cgColor + withdrawButton.layer.borderColor = DesignSystemAsset.BlueGrayColor.gray300.color.cgColor withdrawButton.setAttributedTitle(withDrawAttributedString, for: .normal) #if DEBUG @@ -272,7 +272,7 @@ extension RequestViewController { bombButton.rx.tap .withUnretained(self) - .subscribe(onNext: { owner, _ in + .subscribe(onNext: { _, _ in let array: [Int] = [0] let _ = array[1] }).disposed(by: disposeBag) diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/ServiceInfo/ServiceInfoViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/ServiceInfo/ServiceInfoViewController.swift index 3638bc9bf..988fbd9a3 100644 --- a/Projects/Features/MyInfoFeature/Sources/ViewControllers/ServiceInfo/ServiceInfoViewController.swift +++ b/Projects/Features/MyInfoFeature/Sources/ViewControllers/ServiceInfo/ServiceInfoViewController.swift @@ -138,10 +138,10 @@ extension ServiceInfoViewController: UITableViewDelegate { extension ServiceInfoViewController { private func configureUI() { backButton.setImage(DesignSystemAsset.Navigation.back.image, for: .normal) - view.backgroundColor = DesignSystemAsset.GrayColor.gray100.color + view.backgroundColor = DesignSystemAsset.BlueGrayColor.gray100.color titleStringLabel.text = "서비스 정보" titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16) - titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + titleStringLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color titleStringLabel.setTextWithAttributes(kernValue: -0.5) tableView.tableHeaderView = UIView(frame: CGRect(x: 0, y: 0, width: APP_WIDTH(), height: 20)) tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: APP_WIDTH(), height: 56)) diff --git a/Projects/Features/MyInfoFeature/Sources/Views/AppPushSettingView.swift b/Projects/Features/MyInfoFeature/Sources/Views/AppPushSettingView.swift index ff00a2838..0968a6b23 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/AppPushSettingView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/AppPushSettingView.swift @@ -22,11 +22,15 @@ final class AppPushSettingView: UIView { $0.setImage(dismissImage, for: .normal) } - private let titleLabel = UILabel().then { + private let titleLabel = WMLabel( + text: "앱 알림 설정", + textColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, + font: .t5(weight: .medium), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t5().lineHeight, + kernValue: -0.5 + ).then { $0.numberOfLines = .zero - $0.textColor = DesignSystemAsset.BlueGrayColor.blueGray900.color - $0.text = "앱 알림 설정" - $0.font = .setFont(.t5(weight: .medium)) } init() { diff --git a/Projects/Features/MyInfoFeature/Sources/Views/DrawButtonView.swift b/Projects/Features/MyInfoFeature/Sources/Views/DrawButtonView.swift index 32d5d447d..8943ceded 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/DrawButtonView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/DrawButtonView.swift @@ -17,18 +17,24 @@ final class DrawButtonView: UIView { $0.layer.cornerRadius = 8 $0.clipsToBounds = true } - - let titleLabel = UILabel().then { - $0.text = "내 열매" - $0.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16) - $0.textColor = DesignSystemAsset.BlueGrayColor.blueGray900.color - } - - let countLabel = UILabel().then { - $0.text = "0개" - $0.font = DesignSystemFontFamily.Pretendard.bold.font(size: 16) - $0.textColor = DesignSystemAsset.PrimaryColorV2.point.color - } + + let titleLabel = WMLabel( + text: "내 열매", + textColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, + font: .t5(weight: .medium), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t5().lineHeight, + kernValue: -0.5 + ) + + let countLabel = WMLabel( + text: "0개", + textColor: DesignSystemAsset.PrimaryColorV2.point.color, + font: .t5(weight: .medium), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t5().lineHeight, + kernValue: -0.5 + ) let drawButton = UIButton().then { $0.titleLabel?.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14) diff --git a/Projects/Features/MyInfoFeature/Sources/Views/LoginWarningView.swift b/Projects/Features/MyInfoFeature/Sources/Views/LoginWarningView.swift index 6d54f37d9..aa8f88e24 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/LoginWarningView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/LoginWarningView.swift @@ -14,11 +14,15 @@ final class LoginWarningView: UIView { $0.contentMode = .scaleAspectFill $0.image = DesignSystemAsset.Search.warning.image } - - private let label: UILabel = UILabel().then { - $0.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14) - $0.textColor = DesignSystemAsset.BlueGrayColor.blueGray900.color - $0.textAlignment = .center + + private let label = WMLabel( + text: "", + textColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, + font: .t6(weight: .medium), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t6().lineHeight, + kernValue: -0.5 + ).then { $0.backgroundColor = .clear $0.numberOfLines = .zero } diff --git a/Projects/Features/MyInfoFeature/Sources/Views/NoticeDetailHeaderView.swift b/Projects/Features/MyInfoFeature/Sources/Views/NoticeDetailHeaderView.swift index fadd3e7d5..d43a5ebdc 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/NoticeDetailHeaderView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/NoticeDetailHeaderView.swift @@ -21,19 +21,19 @@ class NoticeDetailHeaderView: UICollectionReusableView { super.awakeFromNib() titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 18) - titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + titleStringLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color titleStringLabel.setTextWithAttributes(kernValue: -0.5, lineSpacing: 0, lineHeightMultiple: 1.26) dateLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12) - dateLabel.textColor = DesignSystemAsset.GrayColor.gray500.color + dateLabel.textColor = DesignSystemAsset.BlueGrayColor.gray500.color dateLabel.setTextWithAttributes(kernValue: -0.5, lineSpacing: 0, lineHeightMultiple: 0) timeLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12) - timeLabel.textColor = DesignSystemAsset.GrayColor.gray500.color + timeLabel.textColor = DesignSystemAsset.BlueGrayColor.gray500.color timeLabel.setTextWithAttributes(kernValue: -0.5, lineSpacing: 0, lineHeightMultiple: 0) contentStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14) - contentStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + contentStringLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color contentStringLabel.setTextWithAttributes(kernValue: -0.5, lineSpacing: 0, lineHeightMultiple: 1.26) } } @@ -48,7 +48,7 @@ extension NoticeDetailHeaderView { string: model.title, attributes: [ .font: DesignSystemFontFamily.Pretendard.medium.font(size: 18), - .foregroundColor: DesignSystemAsset.GrayColor.gray900.color, + .foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color, .kern: -0.5, .paragraphStyle: paragraphStyle ] @@ -60,7 +60,7 @@ extension NoticeDetailHeaderView { string: contentString, attributes: [ .font: DesignSystemFontFamily.Pretendard.medium.font(size: 14), - .foregroundColor: DesignSystemAsset.GrayColor.gray900.color, + .foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color, .kern: -0.5, .paragraphStyle: paragraphStyle ] diff --git a/Projects/Features/MyInfoFeature/Sources/Views/NoticeListCell.swift b/Projects/Features/MyInfoFeature/Sources/Views/NoticeListCell.swift index 9c9df1b67..b41ae3c43 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/NoticeListCell.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/NoticeListCell.swift @@ -22,15 +22,15 @@ class NoticeListCell: UITableViewCell { self.contentView.backgroundColor = .clear titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16) - titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + titleStringLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color titleStringLabel.setTextWithAttributes(kernValue: -0.5, lineSpacing: 0, lineHeightMultiple: 1.26) dayLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12) - dayLabel.textColor = DesignSystemAsset.GrayColor.gray500.color + dayLabel.textColor = DesignSystemAsset.BlueGrayColor.gray500.color dayLabel.setTextWithAttributes(kernValue: -0.5, lineSpacing: 0, lineHeightMultiple: 0) timeLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12) - timeLabel.textColor = DesignSystemAsset.GrayColor.gray500.color + timeLabel.textColor = DesignSystemAsset.BlueGrayColor.gray500.color timeLabel.setTextWithAttributes(kernValue: -0.5, lineSpacing: 0, lineHeightMultiple: 0) } } diff --git a/Projects/Features/MyInfoFeature/Sources/Views/OpenSourceLibraryCell.swift b/Projects/Features/MyInfoFeature/Sources/Views/OpenSourceLibraryCell.swift index 3de1e3b98..70187daf1 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/OpenSourceLibraryCell.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/OpenSourceLibraryCell.swift @@ -19,11 +19,11 @@ public class OpenSourceLibraryCell: UITableViewCell { self.backgroundColor = .clear self.contentView.backgroundColor = .clear titleStringLabel.font = DesignSystemFontFamily.Pretendard.bold.font(size: 15) - titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + titleStringLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color titleStringLabel.setTextWithAttributes(kernValue: -0.5) titleStringLabel.numberOfLines = 0 descriptionLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 13) - descriptionLabel.textColor = DesignSystemAsset.GrayColor.gray500.color + descriptionLabel.textColor = DesignSystemAsset.BlueGrayColor.gray500.color descriptionLabel.setTextWithAttributes(kernValue: -0.5) descriptionLabel.lineBreakMode = .byWordWrapping descriptionLabel.numberOfLines = 0 diff --git a/Projects/Features/MyInfoFeature/Sources/Views/OpenSourceLicenseCell.swift b/Projects/Features/MyInfoFeature/Sources/Views/OpenSourceLicenseCell.swift index 5cc65cb16..d1f15254b 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/OpenSourceLicenseCell.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/OpenSourceLicenseCell.swift @@ -19,11 +19,11 @@ class OpenSourceLicenseCell: UITableViewCell { self.backgroundColor = .clear self.contentView.backgroundColor = .clear titleStringLabel.font = DesignSystemFontFamily.Pretendard.bold.font(size: 18) - titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + titleStringLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color titleStringLabel.setTextWithAttributes(kernValue: -0.5) titleStringLabel.numberOfLines = 0 descriptionLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 13) - descriptionLabel.textColor = DesignSystemAsset.GrayColor.gray500.color + descriptionLabel.textColor = DesignSystemAsset.BlueGrayColor.gray500.color descriptionLabel.setTextWithAttributes(kernValue: -0.5) descriptionLabel.lineBreakMode = .byWordWrapping descriptionLabel.numberOfLines = 0 diff --git a/Projects/Features/MyInfoFeature/Sources/Views/ProfileView.swift b/Projects/Features/MyInfoFeature/Sources/Views/ProfileView.swift index f9ffcc3a0..60352273c 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/ProfileView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/ProfileView.swift @@ -19,19 +19,26 @@ final class ProfileView: UIView { $0.image = DesignSystemAsset.MyInfo.iconColor.image } - private let nameLabel: UILabel = UILabel().then { - $0.text = "" - $0.textAlignment = .center + private let nameLabel = WMLabel( + text: "", + textColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, + font: .t4(weight: .light), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t4().lineHeight, + kernValue: -0.5 + ).then { $0.backgroundColor = .clear $0.numberOfLines = .zero } - private let platformLabel: UILabel = UILabel().then { - $0.text = "로 로그인 중" - $0.font = .setFont(.t6(weight: .light)) - $0.textColor = DesignSystemAsset.BlueGrayColor.blueGray600.color - $0.setTextWithAttributes(kernValue: -0.5) - $0.textAlignment = .center + private let platformLabel = WMLabel( + text: "로 로그인 중", + textColor: DesignSystemAsset.BlueGrayColor.blueGray600.color, + font: .t6(weight: .light), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t6().lineHeight, + kernValue: -0.5 + ).then { $0.backgroundColor = .clear $0.numberOfLines = .zero } diff --git a/Projects/Features/MyInfoFeature/Sources/Views/ServiceInfoCell.swift b/Projects/Features/MyInfoFeature/Sources/Views/ServiceInfoCell.swift index f0dc6dbfd..241988d67 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/ServiceInfoCell.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/ServiceInfoCell.swift @@ -22,10 +22,10 @@ class ServiceInfoCell: UITableViewCell { self.backgroundColor = .clear self.contentView.backgroundColor = .clear titleStringLabel.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16) - titleStringLabel.textColor = DesignSystemAsset.GrayColor.gray900.color + titleStringLabel.textColor = DesignSystemAsset.BlueGrayColor.gray900.color titleStringLabel.setTextWithAttributes(kernValue: -0.5) subTitleStringLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12) - subTitleStringLabel.textColor = DesignSystemAsset.GrayColor.gray500.color + subTitleStringLabel.textColor = DesignSystemAsset.BlueGrayColor.gray500.color subTitleStringLabel.setTextWithAttributes(kernValue: -0.5) } } diff --git a/Projects/Features/MyInfoFeature/Sources/Views/SettingItemView.swift b/Projects/Features/MyInfoFeature/Sources/Views/SettingItemView.swift index 598d2319b..89e2876bc 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/SettingItemView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/SettingItemView.swift @@ -10,11 +10,14 @@ private protocol SettingItemActionProtocol { } final class SettingItemView: UIView { - private let leftLabel = UILabel().then { - $0.font = .setFont(.t5(weight: .medium)) - $0.textColor = DesignSystemAsset.BlueGrayColor.blueGray900.color - $0.setTextWithAttributes(kernValue: -0.5) - } + private let leftLabel = WMLabel( + text: "", + textColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, + font: .t5(weight: .medium), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t5().lineHeight, + kernValue: -0.5 + ) private let rightImageView = UIImageView().then { $0.image = DesignSystemAsset.Navigation.serviceInfoArrowRight.image diff --git a/Projects/Features/MyInfoFeature/Sources/Views/SettingView.swift b/Projects/Features/MyInfoFeature/Sources/Views/SettingView.swift index 5da1ece32..1fc212df7 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/SettingView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/SettingView.swift @@ -29,13 +29,14 @@ final class SettingView: UIView { $0.setImage(dismissImage, for: .normal) } - private let titleLabel = UILabel().then { - $0.numberOfLines = .zero - $0.textColor = DesignSystemAsset.BlueGrayColor.blueGray900.color - $0.text = "설정" - $0.font = .setFont(.t5(weight: .medium)) - $0.setTextWithAttributes(kernValue: -0.5) - } + private let titleLabel = WMLabel( + text: "설정", + textColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, + font: .t5(weight: .medium), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t5().lineHeight, + kernValue: -0.5 + ) fileprivate let withDrawButton = UIButton().then { $0.setTitle("회원탈퇴", for: .normal) @@ -46,7 +47,7 @@ final class SettingView: UIView { $0.layer.borderWidth = 1 $0.layer.borderColor = DesignSystemAsset.BlueGrayColor.blueGray300.color.cgColor } - + private let versionLabel = UILabel().then { $0.text = "0.0.0" $0.font = DesignSystemFontFamily.SCoreDream._3Light.font(size: 12) @@ -87,14 +88,17 @@ final class SettingView: UIView { $0.image = DesignSystemAsset.MyInfo.dot.image } - private let descriptionLabel = UILabel().then { + private let descriptionLabel = WMLabel( + text: "왁타버스 뮤직 팀에 속한 모든 팀원들은 부아내비 (부려먹는 게 아니라 내가 비빈 거다)라는 모토를 가슴에 새기고 일하고 있습니다.", + textColor: DesignSystemAsset.BlueGrayColor.blueGray500.color, + font: .t7(weight: .light), + alignment: .center, + lineHeight: UIFont.WMFontSystem.t7().lineHeight, + kernValue: -0.5 + ).then { $0.numberOfLines = 0 $0.textColor = .black - $0.text = "왁타버스 뮤직 팀에 속한 모든 팀원들은 부아내비 (부려먹는 게 아니라 내가 비빈 거다)라는 모토를 가슴에 새기고 일하고 있습니다." - $0.font = .setFont(.t7(weight: .light)) - $0.textColor = DesignSystemAsset.BlueGrayColor.blueGray500.color $0.lineBreakMode = .byWordWrapping - $0.setTextWithAttributes(kernValue: -0.5) } init() { From 782740afcf5bfb6f0431e1fd7c9ce9a98001f245 Mon Sep 17 00:00:00 2001 From: youn9k Date: Tue, 11 Jun 2024 00:03:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=8E=A8=20::=20=EC=BD=94=EB=93=9C=20Fo?= =?UTF-8?q?rmatting=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/Question/QuestionViewController.swift | 4 ++-- .../Features/MyInfoFeature/Sources/Views/DrawButtonView.swift | 4 ++-- .../MyInfoFeature/Sources/Views/LoginWarningView.swift | 2 +- .../Features/MyInfoFeature/Sources/Views/SettingView.swift | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift index 470031751..14d3c6f17 100644 --- a/Projects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift +++ b/Projects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift @@ -249,8 +249,8 @@ extension QuestionViewController { guard let self = self else { return } if source == .addSong { let link: String = "https://whimsical.com/E3GQxrTaafVVBrhm55BNBS" - let text = - "· 이세돌 분들이 부르신 걸 이파리분들이 개인 소장용으로 일부 공개한 영상을 올리길 원하시면 ‘왁타버스 뮤직’으로 왁물원 채팅 부탁드립니다.\n· 왁뮤에 들어갈 수 있는 기준을 충족하는지 꼭 확인하시고 추가 요청해 주세요." + let text = + "· 이세돌 분들이 부르신 걸 이파리분들이 개인 소장용으로 일부 공개한 영상을 올리길 원하시면 ‘왁타버스 뮤직’으로 왁물원 채팅 부탁드립니다.\n· 왁뮤에 들어갈 수 있는 기준을 충족하는지 꼭 확인하시고 추가 요청해 주세요." guard let textPopupViewController = self.textPopUpFactory.makeView( text: text, cancelButtonIsHidden: false, diff --git a/Projects/Features/MyInfoFeature/Sources/Views/DrawButtonView.swift b/Projects/Features/MyInfoFeature/Sources/Views/DrawButtonView.swift index 8943ceded..f1e67870b 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/DrawButtonView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/DrawButtonView.swift @@ -17,7 +17,7 @@ final class DrawButtonView: UIView { $0.layer.cornerRadius = 8 $0.clipsToBounds = true } - + let titleLabel = WMLabel( text: "내 열매", textColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, @@ -26,7 +26,7 @@ final class DrawButtonView: UIView { lineHeight: UIFont.WMFontSystem.t5().lineHeight, kernValue: -0.5 ) - + let countLabel = WMLabel( text: "0개", textColor: DesignSystemAsset.PrimaryColorV2.point.color, diff --git a/Projects/Features/MyInfoFeature/Sources/Views/LoginWarningView.swift b/Projects/Features/MyInfoFeature/Sources/Views/LoginWarningView.swift index aa8f88e24..4e0a77609 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/LoginWarningView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/LoginWarningView.swift @@ -14,7 +14,7 @@ final class LoginWarningView: UIView { $0.contentMode = .scaleAspectFill $0.image = DesignSystemAsset.Search.warning.image } - + private let label = WMLabel( text: "", textColor: DesignSystemAsset.BlueGrayColor.blueGray900.color, diff --git a/Projects/Features/MyInfoFeature/Sources/Views/SettingView.swift b/Projects/Features/MyInfoFeature/Sources/Views/SettingView.swift index 1fc212df7..eb1c3d8c6 100644 --- a/Projects/Features/MyInfoFeature/Sources/Views/SettingView.swift +++ b/Projects/Features/MyInfoFeature/Sources/Views/SettingView.swift @@ -47,7 +47,7 @@ final class SettingView: UIView { $0.layer.borderWidth = 1 $0.layer.borderColor = DesignSystemAsset.BlueGrayColor.blueGray300.color.cgColor } - + private let versionLabel = UILabel().then { $0.text = "0.0.0" $0.font = DesignSystemFontFamily.SCoreDream._3Light.font(size: 12) From 7b274c2788d72ea18a0d9d62bbb648ea4857e470 Mon Sep 17 00:00:00 2001 From: youn9k Date: Tue, 11 Jun 2024 18:36:31 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8E=A8=20::=20=EC=BD=94=EB=93=9C=20Fo?= =?UTF-8?q?rmatting=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projects/App/Sources/Application/NeedleGenerated.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Projects/App/Sources/Application/NeedleGenerated.swift b/Projects/App/Sources/Application/NeedleGenerated.swift index 6847eb1ef..2b5df6630 100644 --- a/Projects/App/Sources/Application/NeedleGenerated.swift +++ b/Projects/App/Sources/Application/NeedleGenerated.swift @@ -966,6 +966,8 @@ extension AppComponent: Registration { localTable["multiPurposePopUpFactory-any MultiPurposePopUpFactory"] = { self.multiPurposePopUpFactory as Any } localTable["textPopUpFactory-any TextPopUpFactory"] = { self.textPopUpFactory as Any } localTable["containSongsFactory-any ContainSongsFactory"] = { self.containSongsFactory as Any } + localTable["privacyComponent-PrivacyComponent"] = { self.privacyComponent as Any } + localTable["serviceTermsComponent-ServiceTermsComponent"] = { self.serviceTermsComponent as Any } localTable["questionComponent-QuestionComponent"] = { self.questionComponent as Any } localTable["faqComponent-FaqComponent"] = { self.faqComponent as Any } localTable["faqContentComponent-FaqContentComponent"] = { self.faqContentComponent as Any }