[Etc] 컨필릭트 해소

sopt-makers · Jun 6, 2024 · 4fb7c6c · 4fb7c6c
1 parent 026a232
commit 4fb7c6c
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 76 deletions.
diff --git a/SOPT-iOS/Projects/Features/PokeFeature/Sources/Components/PokeProfileListView.swift b/SOPT-iOS/Projects/Features/PokeFeature/Sources/Components/PokeProfileListView.swift
@@ -34,21 +34,21 @@ public final class PokeProfileListView: UIView, PokeCompatible {
   private let nameLabel: UILabel = {
     let label = UILabel()
     label.textColor = DSKitAsset.Colors.gray30.color
-    label.font = UIFont.MDS.heading7
+    label.font = UIFont.MDS.heading7.font
     return label
   }()
 
   private let partLabel: UILabel = {
     let label = UILabel()
     label.textColor = DSKitAsset.Colors.gray300.color
-    label.font = UIFont.MDS.label5
+    label.font = UIFont.MDS.label5.font
     return label
   }()
 
   private let kokCountLabel: UILabel = {
     let label = UILabel()
     label.textColor = DSKitAsset.Colors.gray30.color
-    label.font = UIFont.MDS.heading7
+    label.font = UIFont.MDS.heading7.font
     return label
   }()
 

diff --git a/SOPT-iOS/Projects/Features/PokeFeature/Sources/PokeMainScene/VC/PokeMainVC.swift b/SOPT-iOS/Projects/Features/PokeFeature/Sources/PokeMainScene/VC/PokeMainVC.swift
@@ -30,7 +30,7 @@ public final class PokeMainVC: UIViewController, PokeMainViewControllable {
   }
 
   private let serviceTitleLabel = UILabel().then {
-    $0.font = UIFont.MDS.heading6
+    $0.font = UIFont.MDS.heading6.font
     $0.textColor = DSKitAsset.Colors.gray30.color
     $0.text = I18N.Poke.poke
   }
@@ -70,7 +70,7 @@ public final class PokeMainVC: UIViewController, PokeMainViewControllable {
   private let recommendPokeLabel = UILabel().then {
     $0.text = I18N.Poke.pokeNearbyFriends
     $0.textColor = DSKitAsset.Colors.gray30.color
-    $0.font = UIFont.MDS.title5
+    $0.font = UIFont.MDS.title5.font
   }
 
   private let firstProfileCardGroupView = ProfileCardGroupView(frame: .zero)
@@ -79,7 +79,7 @@ public final class PokeMainVC: UIViewController, PokeMainViewControllable {
 
   // 리프레시
   private let refreshGuideLabel = UILabel().then {
-    $0.font = UIFont.MDS.title7
+    $0.font = UIFont.MDS.title7.font
     $0.textColor = DSKitAsset.Colors.gray200.color
     $0.text = I18N.Poke.refreshGuide
     $0.textAlignment = .center

diff --git a/...-iOS/Projects/Features/PokeFeature/Sources/PokeMainScene/Views/ProfileCardGroupView.swift b/...-iOS/Projects/Features/PokeFeature/Sources/PokeMainScene/Views/ProfileCardGroupView.swift
@@ -32,7 +32,7 @@ public final class ProfileCardGroupView: UIView, PokeCompatible {
 
   private let groupNameLabel = UILabel().then {
     $0.textColor = DSKitAsset.Colors.gray30.color
-    $0.font = UIFont.MDS.title7
+    $0.font = UIFont.MDS.title7.font
   }
 
   private let emptyFriendView = PokeEmptyView().setText(with: I18N.Poke.emptyFriendDescription)

diff --git a/.../PokeFeature/Sources/PokeMakingFriendCompletedScene/VC/PokeAnonymousFriendUpgradeVC.swift b/.../PokeFeature/Sources/PokeMakingFriendCompletedScene/VC/PokeAnonymousFriendUpgradeVC.swift
@@ -29,7 +29,7 @@ public class PokeAnonymousFriendUpgradeVC: UIViewController, PokeAnonymousFriend
   // MARK: - UI Components
 
   private let titleLabel = UILabel().then {
-    $0.font = UIFont.MDS.title3
+    $0.font = UIFont.MDS.title3.font
     $0.textColor = DSKitAsset.Colors.gray10.color
     $0.numberOfLines = 2
     $0.textAlignment = .center
@@ -43,7 +43,7 @@ public class PokeAnonymousFriendUpgradeVC: UIViewController, PokeAnonymousFriend
   }
 
   private let descriptionLabel = UILabel().then {
-    $0.font = UIFont.MDS.title5
+    $0.font = UIFont.MDS.title5.font
     $0.textColor = DSKitAsset.Colors.gray10.color
     $0.numberOfLines = 2
     $0.textAlignment = .center

diff --git a/...ure/Sources/PokeOnboardingScene/PokeOnboardingBottomSheet/PokeOnboardingBottomSheet.swift b/...ure/Sources/PokeOnboardingScene/PokeOnboardingBottomSheet/PokeOnboardingBottomSheet.swift
@@ -13,34 +13,14 @@ import DSKit
 
 // MARK: - PokeOnboardingBottomSheet
 public class PokeOnboardingBottomSheet: UIViewController {
-    private enum Metric {
-        static let contentTop = 24.f
-        static let contentLeadingTrailng = 20.f
-
-        static let titleLabelTop = 12.f
-
-        static let onboardingImageHeight = 180.f
-
-        static let descriptionTop = 8.f
-
-        static let doneButtonTop = 34.f
-        static let doneButtonLeadingTrailng = 16.f
-    }
-
-    private let contentStackView = UIStackView().then {
-        $0.axis = .vertical
-        $0.spacing = Metric.titleLabelTop
-    }
-
-    private let titleLabel = UILabel().then {
-        $0.text = "솝트에 콕 찌르기가 생겼어요!"
-        $0.textColor = DSKitAsset.Colors.gray30.color
-        $0.font = DSKitFontFamily.Suit.bold.font(size: 20)
-    }
+  private enum Metric {
+    static let contentTop = 24.f
+    static let contentLeadingTrailng = 20.f
+
+    static let titleLabelTop = 12.f
+    static let onboardingImageHeight = 180.f
 
-    private let onboardingImageView = UIImageView().then {
-        $0.image = DSKitAsset.Assets.pokeOnboarding.image
-    }
+    static let descriptionTop = 8.f
 
     static let doneButtonTop = 34.f
     static let doneButtonLeadingTrailng = 16.f
@@ -52,21 +32,20 @@ public class PokeOnboardingBottomSheet: UIViewController {
   }
 
   private let titleLabel = UILabel().then {
-    $0.attributedText = I18N.Poke.Onboarding.title.applyMDSFont(
-      mdsFont: .heading5,
-      color: DSKitAsset.Colors.gray30.color
-    )
+//    $0.text = I18N.Poke.Onboarding.title
+    $0.textColor = DSKitAsset.Colors.gray30.color
+    $0.font = DSKitFontFamily.Suit.bold.font(size: 20)
   }
 
-  private let onboardingImageView = UIImageView().then {
-    $0.image = DSKitAsset.Assets.iosImgOnboarding.image
-  }
+  private let onboardingImageView = UIImageView()
+//    .then {
+//    $0.image = DSKitAsset.Assets.iosImgOnboarding.image
+//  }
 
   private let onboardingDescriptionLabel = UILabel().then {
-    $0.attributedText = I18N.Poke.Onboarding.description.applyMDSFont(
-      mdsFont: .body3,
-      color: DSKitAsset.Colors.gray30.color
-    )
+//    $0.text = I18N.Poke.Onboarding.description
+    $0.font = DSKitFontFamily.Suit.medium.font(size: 14)
+    $0.textColor = DSKitAsset.Colors.gray30.color
     $0.textAlignment = .left
     $0.numberOfLines = 0
   }
@@ -85,36 +64,22 @@ public class PokeOnboardingBottomSheet: UIViewController {
   init() {
     super.init(nibName: nil, bundle: nil)
 
-    private lazy var doneButton = MDSButton(
-        buttonSize: .medium,
-        leftImage: nil,
-        buttonTitle: "확인",
-        rightImage: nil,
-        frame: self.view.frame
-    )
+    self.view.backgroundColor = DSKitAsset.Colors.gray800.color
 
-    // MARK: - Variables
-    private let cancelBag = CancelBag()
+    self.initializeViews()
+    self.setupConstraints()
 
-    init() {
-        super.init(nibName: nil, bundle: nil)
-
-        self.view.backgroundColor = DSKitAsset.Colors.gray800.color
-
-        self.initializeViews()
-        self.setupConstraints()
-
-        self.doneButton
-            .signalForButtonClick()
-            .withUnretained(self)
-            .sink(receiveValue: { _ in 
-                self.dismiss(animated: true)
-            }).store(in: self.cancelBag)
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
+    self.doneButton
+      .signalForButtonClick()
+      .withUnretained(self)
+      .sink(receiveValue: { _ in
+        self.dismiss(animated: true)
+      }).store(in: self.cancelBag)
+  }
+
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
 }
 
 extension PokeOnboardingBottomSheet {

diff --git a/SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STPartChartRectangleView.swift b/SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STPartChartRectangleView.swift
@@ -44,7 +44,7 @@ public class STPartChartRectangleView: UIView {
 
   private let partNameLabel: UILabel = {
     let label = UILabel()
-    label.setTypoStyle(.MDS.body3)
+    label.setTypoStyle(.MDS.body3.font)
     label.textColor = .black
     label.lineBreakMode = .byTruncatingTail
     label.setCharacterSpacing(0)