Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ”€ :: (#1225) μ•„ν‹°μŠ€νŠΈ μˆλ„€μž„ μ‚¬μš© 였λ₯˜ μˆ˜μ • #1226

Merged
merged 1 commit into from
Aug 25, 2024
Merged

πŸ”€ :: (#1225) μ•„ν‹°μŠ€νŠΈ μˆλ„€μž„ μ‚¬μš© 였λ₯˜ μˆ˜μ • #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Projects/Domains/ArtistDomain/Sources/ResponseDTO/ArtistDetailResponseDTO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public extension ArtistDetailResponseDTO {
let enName: String

private enum CodingKeys: String, CodingKey {
case krName = "krShort"
case krName = "kr"
case enName = "en"
}
}
Expand Down
2 changes: 1 addition & 1 deletion Projects/Domains/ArtistDomain/Sources/ResponseDTO/ArtistListResponseDTO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public extension ArtistListResponseDTO {
let enName: String

private enum CodingKeys: String, CodingKey {
case krName = "krShort"
case krName = "kr"
case enName = "en"
}
}
Expand Down
14 changes: 7 additions & 7 deletions ...cts/Features/ArtistFeature/Sources/ViewControllers/ArtistDetailHeaderViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,27 @@ class ArtistDetailHeaderViewController: UIViewController, ViewControllerFromStor
extension ArtistDetailHeaderViewController {
func update(model: ArtistEntity) {
self.model = model
let artistName: String = model.krName
let artistEngName: String = model.enName.capitalizingFirstLetter
let artistKrName: String = model.krName
let artistEnName: String = model.enName
let artistNameAttributedString = NSMutableAttributedString(
string: artistName + " " + artistEngName,
string: artistKrName + " " + artistEnName,
attributes: [
.font: DesignSystemFontFamily.Pretendard.bold.font(size: 24),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color,
.kern: -0.5
]
)

let artistNameRange = (artistNameAttributedString.string as NSString).range(of: artistName)
let artistEngNameRange = (artistNameAttributedString.string as NSString).range(of: artistEngName)
let artistKrNameRange = (artistNameAttributedString.string as NSString).range(of: artistKrName)
let artistEnNameRange = (artistNameAttributedString.string as NSString).range(of: artistEnName)

artistNameAttributedString.addAttributes(
[
.font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
.foregroundColor: DesignSystemAsset.BlueGrayColor.gray900.color.withAlphaComponent(0.6),
.kern: -0.5
],
range: artistEngNameRange
range: artistEnNameRange
)

let margin: CGFloat = 104.0
Expand All @@ -83,7 +83,7 @@ extension ArtistDetailHeaderViewController {

artistNameAttributedString.addAttributes(
[.font: DesignSystemFontFamily.Pretendard.bold.font(size: availableWidth >= artistNameWidth ? 24 : 20)],
range: artistNameRange
range: artistKrNameRange
)

self.artistNameLabelHeight.constant =
Expand Down
Loading