Merge pull request #594 from wakmusic/550-my-info/wm-label

🔀 :: (#550) 내 정보 피쳐의 UILabel을 WMLabel로 대체합니다.
wakmusic · Jun 11, 2024 · d6b5741 · d6b5741
2 parents 9ae82bf + 7b274c2
commit d6b5741
Show file tree

Hide file tree

Showing 18 changed files with 100 additions and 71 deletions.
diff --git 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 }

diff --git 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/...ts/Features/MyInfoFeature/Sources/ViewControllers/Notice/NoticeDetailViewController.swift b/...ts/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
@@ -86,15 +86,15 @@ 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)
         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/...foFeature/Sources/ViewControllers/OpenSourceLicense/OpenSourceLicenseViewController.swift b/...foFeature/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/...ects/Features/MyInfoFeature/Sources/ViewControllers/Question/QuestionViewController.swift b/...ects/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,28 +65,28 @@ 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)
 
         self.closeButton.setImage(DesignSystemAsset.Navigation.crossClose.image, for: .normal)
 
         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
@@ -193,15 +193,15 @@ 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
                 ]
             )
             buttons[i].setAttributedTitle(attr, for: .normal)
             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/...eatures/MyInfoFeature/Sources/ViewControllers/ServiceInfo/ServiceInfoViewController.swift b/...eatures/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
@@ -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
@@ -18,17 +18,23 @@ final class DrawButtonView: UIView {
         $0.clipsToBounds = true
     }
 
-    let titleLabel = UILabel().then {
-        $0.text = "내 열매"
-        $0.font = DesignSystemFontFamily.Pretendard.medium.font(size: 16)
-        $0.textColor = DesignSystemAsset.BlueGrayColor.blueGray900.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 = UILabel().then {
-        $0.text = "0개"
-        $0.font = DesignSystemFontFamily.Pretendard.bold.font(size: 16)
-        $0.textColor = DesignSystemAsset.PrimaryColorV2.point.color
-    }
+    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
@@ -15,10 +15,14 @@ final class LoginWarningView: UIView {
         $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
@@ -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
@@ -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
@@ -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
@@ -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