Merge pull request #168 from PopPool/refactor/#161-font-system

Author: 0Hooni

Poppool/CoreLayer/Infrastructure/Infrastructure/Extension/String+.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+public extension String {
+    var isHangul: Bool {
+        return "\(self)".range(of: "\\p{Hangul}", options: .regularExpression) != nil
+    }
+}

Poppool/PresentationLayer/DesignSystem/DesignSystem/Components/PPButton.swift

@@ -1,5 +1,7 @@
 import UIKit
 
+import Infrastructure
+
 public class PPButton: UIButton {
 
     public enum ButtonStyle {
@@ -62,6 +64,29 @@ public class PPButton: UIButton {
         }
     }
 
+    public init(
+        buttonStyle: ButtonStyle,
+        fontStyle: PPFontStyle = .KOm16,
+        text: String,
+        disabledText: String = " ",
+        cornerRadius: CGFloat = 4
+    ) {
+        super.init(frame: .zero)
+
+        self.setTitleColor(buttonStyle.textColor, for: .normal)
+        self.setTitleColor(buttonStyle.disabledTextColor, for: .disabled)
+
+        self.setBackgroundColor(buttonStyle.backgroundColor, for: .normal)
+        self.setBackgroundColor(buttonStyle.disabledBackgroundColor, for: .disabled)
+
+        self.setText(to: text, with: fontStyle, for: .normal)
+        self.setText(to: disabledText, with: fontStyle, for: .disabled)
+
+        self.layer.cornerRadius = cornerRadius
+        self.clipsToBounds = true
+    }
+
+    @available(*, deprecated, message: "PPFontStyle로 파싱하는 init을 사용해주세요.")
     public init(
         style: ButtonStyle,
         text: String,
@@ -71,16 +96,22 @@ public class PPButton: UIButton {
     ) {
         super.init(frame: .zero)
 
-        self.setTitle(text, for: .normal)
-        self.setTitle(disabledText, for: .disabled)
+        guard let parseResult = parseToPPFontStyle(text: text, font: font),
+              let PPFontStyle = PPFontStyle(rawValue: parseResult)
+        else {
+            Logger.log("PPFontStyle로 파싱할 수 없는 폰트입니다.", category: .error)
+            return
+        }
 
         self.setTitleColor(style.textColor, for: .normal)
         self.setTitleColor(style.disabledTextColor, for: .disabled)
 
         self.setBackgroundColor(style.backgroundColor, for: .normal)
         self.setBackgroundColor(style.disabledBackgroundColor, for: .disabled)
 
-        self.titleLabel?.font = font
+        self.setText(to: text, with: PPFontStyle, for: .normal)
+        self.setText(to: disabledText, with: PPFontStyle, for: .disabled)
+
         self.layer.cornerRadius = cornerRadius
         self.clipsToBounds = true
     }
@@ -105,3 +136,26 @@ public class PPButton: UIButton {
         self.setBackgroundImage(backgroundImage, for: state)
     }
 }
+
+private extension PPButton {
+    func parseToPPFontStyle(text: String?, font: UIFont?) -> String? {
+        guard let font = font else { return nil }
+
+        var result = ""
+
+        let splitResult = font.fontName.split(separator: "-")
+        splitResult[0] == "Poppins" ? result.append("EN") : result.append("KO")
+
+        switch splitResult[1] {
+        case "Light": result.append("l")
+        case "Regular": result.append("r")
+        case "Medium": result.append("m")
+        case "Bold": result.append("b")
+        default: return nil
+        }
+
+        result.append("\(Int(font.pointSize))")
+
+        return result
+    }
+}

Poppool/PresentationLayer/DesignSystem/DesignSystem/Components/PPCancelHeaderView.swift

@@ -14,9 +14,8 @@ public final class PPCancelHeaderView: UIView {
 
     public let cancelButton: UIButton = {
         let button = UIButton(type: .system)
-        button.setTitle("취소", for: .normal)
-        button.titleLabel?.font = .korFont(style: .regular, size: 14)
         button.setTitleColor(.black, for: .normal)
+        button.setText(to: "취소", with: .KOr14, for: .normal)
         return button
     }()
 

Poppool/PresentationLayer/DesignSystem/DesignSystem/Components/PPLabel.swift

@@ -2,23 +2,61 @@ import UIKit
 
 public class PPLabel: UILabel {
 
+    @available(*, deprecated, renamed: "init(text:style:)", message: "타이포를 직접 지정하는 대신 PPFontStyle을 이용하세요")
     public init(
         style: UIFont.FontStyle = .regular,
         fontSize: CGFloat = 12,
-        text: String = "",
+        text: String = " ",
         lineHeight: CGFloat = 1.2
     ) {
         super.init(frame: .zero)
-        self.font = .korFont(style: style, size: fontSize)
-        let paragraphStyle = NSMutableParagraphStyle()
-        paragraphStyle.lineHeightMultiple = lineHeight
-        self.attributedText = NSMutableAttributedString(
-            string: text,
-            attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle]
-        )
+//        self.font = .korFont(style: style, size: fontSize)
+//        let paragraphStyle = NSMutableParagraphStyle()
+//        paragraphStyle.lineHeightMultiple = lineHeight
+//        self.attributedText = NSMutableAttributedString(
+//            string: text,
+//            attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle]
+//        )
+
+        guard let parseResult = parseToPPFontStyle(
+            style: style,
+            fontSize: fontSize,
+            text: text
+        ) else { return }
+
+        self.setText(to: text, with: PPFontStyle(rawValue: parseResult) ?? .KOb32)
+    }
+
+    public init(
+        text: String = " ", // 값이 없으면 Attribute가 적용이 안돼서 기본값은 공백
+        style: PPFontStyle
+    ) {
+        super.init(frame: .zero)
+        self.setText(to: text, with: style)
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+private extension PPLabel {
+    func parseToPPFontStyle(
+        style: UIFont.FontStyle,
+        fontSize: CGFloat,
+        text: String
+    ) -> String? {
+        var result = text.isHangul ? "KO" : "EN"
+
+        switch style {
+        case .bold: result.append("b")
+        case .medium: result.append("m")
+        case .regular: result.append("r")
+        case .light: result.append("l")
+        }
+
+        result.append("\(Int(fontSize))")
+
+        return result
+    }
+}

Poppool/PresentationLayer/DesignSystem/DesignSystem/Components/PPSearchBarView.swift

@@ -12,7 +12,11 @@ public class PPSearchBarView: UIView {
     }
 
     public let searchBar = UISearchBar().then {
-        $0.searchTextField.setPlaceholder(text: "팝업스토어명을 입력해보세요", color: .g400, font: .korFont(style: .regular, size: 14))
+        $0.searchTextField.setPlaceholder(
+            text: "팝업스토어명을 입력해보세요",
+            color: .g400,
+            style: .KOr14
+        )
         $0.tintColor = .g400
         $0.backgroundColor = .g50
         $0.layer.cornerRadius = 4

Poppool/PresentationLayer/DesignSystem/DesignSystem/Components/PPTagCollectionViewCell/PPTagCollectionViewCell.swift

@@ -9,7 +9,7 @@ public final class PPTagCollectionViewCell: UICollectionViewCell {
 
     public var disposeBag = DisposeBag()
 
-    public let titleLabel = PPLabel(style: .medium, fontSize: 11)
+    public let titleLabel = PPLabel(style: .KOm11)
 
     public let cancelButton = UIButton()
 
@@ -83,6 +83,7 @@ private extension PPTagCollectionViewCell {
     }
 }
 
+// FIXME: Chip 컴포넌트화 및 분기적용 필요 (디자인 시스템 도입 필요)
 extension PPTagCollectionViewCell {
     public func configureCell(title: String? = nil, id: Int?, isSelected: Bool = false, isCancelable: Bool = true, fontSize: CGFloat = 11, cornerRadius: CGFloat = 15.5) {
         let xmarkImage = isSelected ? UIImage(named: "icon_xmark_white") : UIImage(named: "icon_xmark_gray")

Poppool/PresentationLayer/DesignSystem/DesignSystem/Components/PopupGridCollectionViewCell/PPPopupGridCollectionViewCell.swift

@@ -15,40 +15,35 @@ public final class PPPopupGridCollectionViewCell: UICollectionViewCell {
         $0.contentMode = .scaleAspectFill
     }
 
-    private let categoryLabel = PPLabel(style: .bold, fontSize: 11).then {
+    private let categoryLabel = PPLabel(style: .KOb11).then {
         $0.textColor = .blu500
-        $0.setLineHeightText(text: "category", font: .korFont(style: .bold, size: 11))
     }
 
-    private let titleLabel = PPLabel(style: .bold, fontSize: 14).then {
+    private let titleLabel = PPLabel(style: .KOb14).then {
         $0.numberOfLines = 2
         $0.lineBreakMode = .byTruncatingTail
-        $0.setLineHeightText(text: "title", font: .korFont(style: .bold, size: 14))
     }
 
-    private let addressLabel = PPLabel(style: .medium, fontSize: 11).then {
+    private let addressLabel = PPLabel(style: .KOm11).then {
         $0.numberOfLines = 1
         $0.lineBreakMode = .byTruncatingTail
         $0.textColor = .g400
-        $0.setLineHeightText(text: "address", font: .korFont(style: .medium, size: 11))
     }
 
-    private let dateLabel = PPLabel(style: .medium, fontSize: 11).then {
+    private let dateLabel = PPLabel(style: .ENr11).then {
         $0.lineBreakMode = .byTruncatingTail
         $0.textColor = .g400
-        $0.setLineHeightText(text: "date", font: .korFont(style: .medium, size: 11))
     }
 
     public let bookmarkButton = UIButton()
 
-    private let rankLabel = UILabel().then {
+    private let rankLabel = PPLabel(style: .KOm11).then {
         $0.backgroundColor = .w10
         $0.layer.cornerRadius = 12
         $0.clipsToBounds = true
         $0.isHidden = true
         $0.textColor = .w100
         $0.textAlignment = .center
-        $0.setLineHeightText(text: "rank", font: .korFont(style: .medium, size: 11), lineHeight: 1)
     }
 
     // MARK: - init
@@ -103,14 +98,12 @@ private extension PPPopupGridCollectionViewCell {
 
         dateLabel.snp.makeConstraints { make in
             make.leading.equalToSuperview()
-            make.height.equalTo(15).priority(.high)
             make.bottom.equalToSuperview()
         }
 
         addressLabel.snp.makeConstraints { make in
             make.leading.trailing.equalToSuperview()
             make.bottom.equalTo(dateLabel.snp.top)
-            make.height.equalTo(17).priority(.high)
         }
 
         bookmarkButton.snp.makeConstraints { make in
@@ -137,12 +130,12 @@ private extension PPPopupGridCollectionViewCell {
 extension PPPopupGridCollectionViewCell {
     public func configureCell(imagePath: String?, id: Int64, category: String?, title: String?, address: String?, startDate: String?, endDate: String?, isBookmark: Bool, isLogin: Bool, isPopular: Bool = false, row: Int?) {
 
-        categoryLabel.text = "#" + (category ?? "")
-        titleLabel.text = title
-        addressLabel.text = address
+        categoryLabel.updateText(to: "#" + (category ?? ""))
+        titleLabel.updateText(to: title)
+        addressLabel.updateText(to: address)
 
         let date = startDate.toDate().toPPDateString() + " ~ " + endDate.toDate().toPPDateString()
-        dateLabel.text = date
+        dateLabel.updateText(to: date)
 
         let bookmarkImage = isBookmark ? UIImage(named: "icon_bookmark_fill") : UIImage(named: "icon_bookmark")
         bookmarkButton.setImage(bookmarkImage, for: .normal)
@@ -153,7 +146,7 @@ extension PPPopupGridCollectionViewCell {
         rankLabel.isHidden = !isPopular
 
         if let rank = row {
-            rankLabel.text = "\(rank)"
+            rankLabel.updateText(to: "\(rank)")
             rankLabel.isHidden = rank > 2
         }
     }

Poppool/PresentationLayer/DesignSystem/DesignSystem/Extension/UIButton+.swift

@@ -0,0 +1,26 @@
+import UIKit
+
+public extension UIButton {
+    /// Style을 필요로하는 Text가 포함된 일반 버튼에서 사용
+    func setText(
+        to text: String = " ",
+        with style: PPFontStyle,
+        for controlState: UIControl.State = .normal
+    ) {
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineHeightMultiple = style.lineHeightMultiple
+        paragraphStyle.maximumLineHeight = style.lineHeight
+        paragraphStyle.minimumLineHeight = style.lineHeight
+
+        let attributedString = NSAttributedString(
+            string: text,
+            attributes: [
+                .font: UIFont.PPFont(style: style),
+                .paragraphStyle: paragraphStyle,
+                .baselineOffset: style.baseLineOffset
+            ]
+        )
+
+        self.setAttributedTitle(attributedString, for: controlState)
+    }
+}

Poppool/PresentationLayer/DesignSystem/DesignSystem/Extension/UIFont+.swift

@@ -21,6 +21,14 @@ public extension UIFont {
         if let font = UIFont(name: fontName, size: size) { return font } else { return registerAndGetFont(name: fontName, size: size) }
     }
 
+    static func PPFont(style: PPFontStyle) -> UIFont {
+        if let font = UIFont(name: style.fontName, size: style.size) {
+            return font
+        } else {
+            return registerAndGetFont(name: style.fontName, size: style.size)
+        }
+    }
+
     private static func registerAndGetFont(name: String, size: CGFloat) -> UIFont {
         let url = Bundle.module.url(forResource: name, withExtension: "ttf")!
         CTFontManagerRegisterFontURLs([url as CFURL] as CFArray, .process, true, nil)