diff --git a/SOOUM/SOOUM/DesignSystem/Foundations/Typography+SOOUM.swift b/SOOUM/SOOUM/DesignSystem/Foundations/Typography+SOOUM.swift index 2ce38f6b..f9f465a0 100644 --- a/SOOUM/SOOUM/DesignSystem/Foundations/Typography+SOOUM.swift +++ b/SOOUM/SOOUM/DesignSystem/Foundations/Typography+SOOUM.swift @@ -214,6 +214,14 @@ extension V2Style where Base == Typography { /// /// Weight: [Thin: 100, UltraLight: 200, Light: 300, Regular: 400, Medium: 500, SemiBold: 600, Bold: 700, Heavy: 800, Black: 900] static var subtitle2: Typography = .init( + fontContainer: BuiltInFont(size: 14, weight: .bold), + lineHeight: 21, + letterSpacing: -0.025 + ) + /// Size: 14, Line height: 21 + /// + /// Weight: [Thin: 100, UltraLight: 200, Light: 300, Regular: 400, Medium: 500, SemiBold: 600, Bold: 700, Heavy: 800, Black: 900] + static var subtitle3: Typography = .init( fontContainer: BuiltInFont(size: 14, weight: .semibold), lineHeight: 21, letterSpacing: -0.025 diff --git a/SOOUM/SOOUM/DesignSystem/Foundations/UIImage+SOOUM.swift b/SOOUM/SOOUM/DesignSystem/Foundations/UIImage+SOOUM.swift index 0620392e..5d028c5f 100644 --- a/SOOUM/SOOUM/DesignSystem/Foundations/UIImage+SOOUM.swift +++ b/SOOUM/SOOUM/DesignSystem/Foundations/UIImage+SOOUM.swift @@ -204,7 +204,7 @@ extension UIImage.SOOUMType { case onboarding case onboarding_finish case check_square_light - case profile + case profile_large } enum V2LogoStyle: String { diff --git a/SOOUM/SOOUM/Presentations/Intro/Onboarding/Onboarding/OnboardingViewController.swift b/SOOUM/SOOUM/Presentations/Intro/Onboarding/Onboarding/OnboardingViewController.swift index 905f1b49..5ba471c6 100644 --- a/SOOUM/SOOUM/Presentations/Intro/Onboarding/Onboarding/OnboardingViewController.swift +++ b/SOOUM/SOOUM/Presentations/Intro/Onboarding/Onboarding/OnboardingViewController.swift @@ -77,6 +77,7 @@ class OnboardingViewController: BaseNavigationViewController, View { $0.title = Text.oldUserButtontitle $0.typography = .som.v2.body1 $0.foregroundColor = .som.v2.gray500 + $0.backgroundColor = .som.v2.white $0.hasUnderlined = true $0.inset = .init(top: 6, left: 16, bottom: 6, right: 16) } diff --git a/SOOUM/SOOUM/Presentations/Intro/Onboarding/ProfileImageSetting/OnboardingProfileImageSettingViewController.swift b/SOOUM/SOOUM/Presentations/Intro/Onboarding/ProfileImageSetting/OnboardingProfileImageSettingViewController.swift index e8f3e28e..89a70bde 100644 --- a/SOOUM/SOOUM/Presentations/Intro/Onboarding/ProfileImageSetting/OnboardingProfileImageSettingViewController.swift +++ b/SOOUM/SOOUM/Presentations/Intro/Onboarding/ProfileImageSetting/OnboardingProfileImageSettingViewController.swift @@ -53,7 +53,7 @@ class OnboardingProfileImageSettingViewController: BaseNavigationViewController, private let guideMessageView = OnboardingGuideMessageView(title: Text.title, currentNumber: 3) private let profileImageView = UIImageView().then { - $0.image = .init(.image(.v2(.profile))) + $0.image = .init(.image(.v2(.profile_large))) $0.layer.cornerRadius = 120 * 0.5 $0.clipsToBounds = true } @@ -202,7 +202,7 @@ class OnboardingProfileImageSettingViewController: BaseNavigationViewController, reactor.state.map(\.profileImage) .distinctUntilChanged() .subscribe(with: self) { object, profileImage in - object.profileImageView.image = profileImage ?? .init(.image(.v2(.profile))) + object.profileImageView.image = profileImage ?? .init(.image(.v2(.profile_large))) var actions: [SelectProfileBottomFloatView.FloatAction] = [ .init( diff --git a/SOOUM/SOOUM/Presentations/Intro/Onboarding/TermsOfService/Views/TermsOfServiceAgreeButtonView.swift b/SOOUM/SOOUM/Presentations/Intro/Onboarding/TermsOfService/Views/TermsOfServiceAgreeButtonView.swift index 45e95c14..40c70988 100644 --- a/SOOUM/SOOUM/Presentations/Intro/Onboarding/TermsOfService/Views/TermsOfServiceAgreeButtonView.swift +++ b/SOOUM/SOOUM/Presentations/Intro/Onboarding/TermsOfService/Views/TermsOfServiceAgreeButtonView.swift @@ -21,7 +21,7 @@ class TermsOfServiceAgreeButtonView: UIView { // MARK: Views private let checkImageView = UIImageView().then { - $0.image = .init(.icon(.outlined(.check))) + $0.image = .init(.icon(.v2(.outlined(.check)))) $0.tintColor = .som.v2.gray400 } diff --git a/SOOUM/SOOUM/Presentations/Intro/Onboarding/Views/OnboardingGuideMessageView.swift b/SOOUM/SOOUM/Presentations/Intro/Onboarding/Views/OnboardingGuideMessageView.swift index 343c5d86..5cbdc191 100644 --- a/SOOUM/SOOUM/Presentations/Intro/Onboarding/Views/OnboardingGuideMessageView.swift +++ b/SOOUM/SOOUM/Presentations/Intro/Onboarding/Views/OnboardingGuideMessageView.swift @@ -25,7 +25,7 @@ class OnboardingGuideMessageView: UIView { private let titleLabel = UILabel().then { $0.textColor = .som.v2.black - $0.typography = .som.v2.head2 + $0.typography = .som.v2.head2.withAlignment(.left) $0.lineBreakMode = .byWordWrapping $0.lineBreakStrategy = .hangulWordPriority $0.numberOfLines = 0 @@ -36,7 +36,8 @@ class OnboardingGuideMessageView: UIView { var title: String? { set { - self.titleLabel.text = newValue + let attributes = Typography.som.v2.head2.withAlignment(.left).attributes + self.titleLabel.attributedText = .init(string: newValue ?? "", attributes: attributes) } get { return self.titleLabel.text diff --git a/SOOUM/SOOUM/Presentations/Intro/Onboarding/Views/OnboardingNumberingView.swift b/SOOUM/SOOUM/Presentations/Intro/Onboarding/Views/OnboardingNumberingView.swift index b323d0f7..430ee381 100644 --- a/SOOUM/SOOUM/Presentations/Intro/Onboarding/Views/OnboardingNumberingView.swift +++ b/SOOUM/SOOUM/Presentations/Intro/Onboarding/Views/OnboardingNumberingView.swift @@ -85,8 +85,8 @@ private extension OnboardingNumberingView { let label = UILabel().then { $0.text = "\(number)" - $0.textColor = .white - $0.typography = .som.v2.subtitle2 + $0.textColor = .som.v2.white + $0.typography = .som.v2.subtitle3 } backgroundView.addSubview(label) diff --git a/SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile.imageset/Contents.json b/SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile_large.imageset/Contents.json similarity index 84% rename from SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile.imageset/Contents.json rename to SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile_large.imageset/Contents.json index 257a53bb..76a87433 100644 --- a/SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile.imageset/Contents.json +++ b/SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile_large.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "profile.svg", + "filename" : "v2_profile_large.svg", "idiom" : "universal" } ], diff --git a/SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile.imageset/profile.svg b/SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile_large.imageset/v2_profile_large.svg similarity index 99% rename from SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile.imageset/profile.svg rename to SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile_large.imageset/v2_profile_large.svg index 7affdc14..3d173cab 100644 --- a/SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile.imageset/profile.svg +++ b/SOOUM/SOOUM/Resources/Assets.xcassets/DesignSystem/V2/Images/v2_profile_large.imageset/v2_profile_large.svg @@ -1,9 +1,9 @@ - - + + - - + + - + diff --git a/SOOUM/SOOUM/Utilities/Typography/Typography.swift b/SOOUM/SOOUM/Utilities/Typography/Typography.swift index b297aa83..866154aa 100644 --- a/SOOUM/SOOUM/Utilities/Typography/Typography.swift +++ b/SOOUM/SOOUM/Utilities/Typography/Typography.swift @@ -31,8 +31,7 @@ class Typography: NSObject, NSCopying { var attributes: [NSAttributedString.Key: Any] { let fontLineHeight = self.font.lineHeight let lineHeight = self.lineHeight - let adjustment: CGFloat = lineHeight > fontLineHeight ? 2.0 : 1.0 - let baselineOffset: CGFloat = (lineHeight - fontLineHeight) / 2.0 / adjustment + let baselineOffset: CGFloat = (lineHeight - fontLineHeight) / 2.0 return [ .paragraphStyle: self.paragraphStyle, .kern: self.letterSpacing, diff --git a/SOOUM/SOOUM/Utilities/Typography/UILabel+Typography.swift b/SOOUM/SOOUM/Utilities/Typography/UILabel+Typography.swift index 63fd6bc5..29a03d83 100644 --- a/SOOUM/SOOUM/Utilities/Typography/UILabel+Typography.swift +++ b/SOOUM/SOOUM/Utilities/Typography/UILabel+Typography.swift @@ -73,6 +73,7 @@ extension UILabel { } } + /// When self.text == nil, must set typography when input text var typography: Typography? { set { if let typography: Typography = newValue { diff --git a/SOOUM/SOOUM/Utilities/Typography/UITextField+Typography.swift b/SOOUM/SOOUM/Utilities/Typography/UITextField+Typography.swift index af06beb0..23d1bf2c 100644 --- a/SOOUM/SOOUM/Utilities/Typography/UITextField+Typography.swift +++ b/SOOUM/SOOUM/Utilities/Typography/UITextField+Typography.swift @@ -61,6 +61,7 @@ extension UITextField { self.defaultTextAttributes = attributes } + /// When self.text == nil, must set typography when input text var typography: Typography? { set { if let typography: Typography = newValue { diff --git a/SOOUM/SOOUM/Utilities/Typography/UITextView+Typography.swift b/SOOUM/SOOUM/Utilities/Typography/UITextView+Typography.swift index 64e42b7a..9ec6807c 100644 --- a/SOOUM/SOOUM/Utilities/Typography/UITextView+Typography.swift +++ b/SOOUM/SOOUM/Utilities/Typography/UITextView+Typography.swift @@ -38,6 +38,7 @@ extension UITextView { self.typingAttributes = attributes } + /// When self.text == nil, must set typography when input text var typography: Typography? { set { if let typography: Typography = newValue {