Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions SOOUM/SOOUM/DesignSystem/Foundations/Typography+SOOUM.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SOOUM/SOOUM/DesignSystem/Foundations/UIImage+SOOUM.swift
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ extension UIImage.SOOUMType {
case onboarding
case onboarding_finish
case check_square_light
case profile
case profile_large
}

enum V2LogoStyle: String {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "profile.svg",
"filename" : "v2_profile_large.svg",
"idiom" : "universal"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions SOOUM/SOOUM/Utilities/Typography/Typography.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions SOOUM/SOOUM/Utilities/Typography/UILabel+Typography.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading