refactor: WTitleLabel lineheight 개선 #82

YAPP-Github · Jul 25, 2022 · 8e7bf9c · 8e7bf9c
1 parent 80cb013
commit 8e7bf9c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/Weekand/Weekand/Presentation/Common/View/WMultiLineTextLabel.swift b/Weekand/Weekand/Presentation/Common/View/WMultiLineTextLabel.swift
@@ -25,10 +25,9 @@ class WMultiLineTextLabel: UILabel {
  }
 
  func setText(string: String) {
- let attrString = NSMutableAttributedString(string: string)
  let paragraphStyle = NSMutableParagraphStyle()
  paragraphStyle.lineHeightMultiple = 1.33
- attrString.addAttribute(NSAttributedString.Key.paragraphStyle, value: paragraphStyle, range: NSMakeRange(0, attrString.length))
+ let attrString = NSMutableAttributedString(string: string, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle])
  attributedText = attrString
  }
 

diff --git a/Weekand/Weekand/Presentation/Common/View/WTitleLabel.swift b/Weekand/Weekand/Presentation/Common/View/WTitleLabel.swift
@@ -25,11 +25,9 @@ class WTitleLabel: UILabel {
  }
 
  func setText(string: String) {
- let attrString = NSMutableAttributedString(string: string)
  let paragraphStyle = NSMutableParagraphStyle()
- paragraphStyle.lineSpacing = 5
- // legacy code
- attrString.addAttribute(NSAttributedString.Key.paragraphStyle, value: paragraphStyle, range: NSMakeRange(0, attrString.length))
+ paragraphStyle.lineHeightMultiple = 1.25
+ let attrString = NSMutableAttributedString(string: string, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle])
  attributedText = attrString
  }
 

diff --git a/Weekand/Weekand/Presentation/SignScene/SignIn/View/PasswordFindViewController.swift b/Weekand/Weekand/Presentation/SignScene/SignIn/View/PasswordFindViewController.swift
@@ -20,10 +20,8 @@ class PasswordFindViewController: UIViewController {
  $0.tintColor = .gray400
  }
 
- lazy var titleLabel = WTextLabel().then {
- $0.text = "비밀번호를\n잊으셨나요?"
- $0.font = WFont.title()
- $0.numberOfLines = 0
+ lazy var titleLabel = WTitleLabel().then {
+ $0.setText(string: "비밀번호를\n잊으셨나요?")
  }
 
  lazy var informLabel = WMultiLineTextLabel().then {

diff --git a/Weekand/Weekand/Presentation/SignScene/SignIn/View/SignInViewController.swift b/Weekand/Weekand/Presentation/SignScene/SignIn/View/SignInViewController.swift
@@ -16,13 +16,11 @@ class SignInViewController: BaseViewController {
  private let disposeBag = DisposeBag()
  var viewModel: SignInViewModel?
 
- lazy var titleLabel = UILabel().then {
- $0.text = """
- 반가워요!
- 함께 일정 관리해요 :)
- """
- $0.font = UIFont(name: "PretendardVariable-Bold", size: 24)
- $0.numberOfLines = 0
+ lazy var titleLabel = WTitleLabel().then {
+ $0.setText(string: """
+ 반가워요!
+ 함께 일정 관리해요 :)
+ """)
  }
 
  let spacerView = UIView()