Skip to content

다이나믹 폰트 적용 #650

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

Merged
kitcat-s merged 3 commits into from
Oct 26, 2025
Merged

다이나믹 폰트 적용 #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d409e2
add: 다이나믹 폰트 21 사이즈 추가하기
kitcat-s Oct 26, 2025
22ef7ff
feat: 다이나믹 폰트 적용하기 - 대시보드 + 북마크 가져오기
kitcat-s Oct 26, 2025
1fa2ce7
feat: 다이나믹 폰트 적용하기 - 공통 UI
kitcat-s Oct 26, 2025
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
9 changes: 9 additions & 0 deletions AIProject/iCo/Core/Util/Font+Util.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,15 @@ extension Font {
static var ico20H = Font.dynamic(size: 20, weight: .heavy)
static var ico20Bl = Font.dynamic(size: 20, weight: .black)

// 21pt
static var ico21 = Font.dynamic(size: 21, weight: .regular)
static var ico21L = Font.dynamic(size: 21, weight: .light)
static var ico21M = Font.dynamic(size: 21, weight: .medium)
static var ico21Sb = Font.dynamic(size: 21, weight: .semibold)
static var ico21B = Font.dynamic(size: 21, weight: .bold)
static var ico21H = Font.dynamic(size: 21, weight: .heavy)
static var ico21Bl = Font.dynamic(size: 21, weight: .black)

// 24pt
static var ico24 = Font.dynamic(size: 24, weight: .regular)
static var ico24L = Font.dynamic(size: 24, weight: .light)
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/CommonPlaceholderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct CommonPlaceholderView: View {
.padding(.bottom, 16)

Text(text)
.font(.system(size: 14))
.font(.ico14)
.foregroundStyle(.iCoLabelSecondary)
.lineSpacing(6)
}
Expand Down
6 changes: 3 additions & 3 deletions AIProject/iCo/Features/Base/DefaultProgressView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ struct DefaultProgressView: View {
.background(.iCoBackgroundAccent)
case .failure:
Image(systemName: "xmark.octagon")
.font(.system(size: 35))
.font(.ico35)
.foregroundStyle(.iCoNeutral)
.padding(8)
.background(.iCoBackgroundWhite)
case .cancel:
Image(systemName: "exclamationmark.octagon")
.font(.system(size: 35))
.font(.ico35)
.foregroundStyle(.iCoNeutral)
.padding(8)
.background(.iCoBackgroundWhite)
Expand All @@ -81,7 +81,7 @@ struct DefaultProgressView: View {
.padding(.bottom, 18)

Text(message)
.font(.system(size: 14))
.font(.ico14)
.foregroundColor(.iCoLabel)
.multilineTextAlignment(.center)
.lineSpacing(4)
Expand Down
8 changes: 4 additions & 4 deletions AIProject/iCo/Features/Base/HeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,28 +72,28 @@ struct HeaderView: View {
VStack(alignment: .leading, spacing: 4) {
HStack(alignment: .center, spacing: 4) {
Text(heading)
.font(.system(size: heading.count < 11 ? 21 : 18, weight: .black))
.font(heading.count < 11 ? .ico21B : .ico18B)
.foregroundStyle(.iCoLabel)
.lineLimit(2)

if showNewBadge {
Text("N")
.font(.system(size: 12, weight: .heavy))
.font(.ico12H)
.foregroundStyle(.white)
.padding(4)
.background(Circle().foregroundStyle(.iCoAccent))
}
}

Text(coin)
.font(.system(size: 14, weight: .bold))
.font(.ico14B)
.foregroundStyle(.iCoLabelSecondary)
}
}
} else {
HStack(alignment: .center, spacing: 8) {
Text(heading)
.font(.system(size: 24, weight: .black))
.font(.ico24B)
.foregroundStyle(headingColor)
.lineLimit(2)
.multilineTextAlignment(showBackButton ? .center : .leading)
Expand Down
4 changes: 2 additions & 2 deletions AIProject/iCo/Features/Base/RoundedButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ struct RoundedButton: View {
HStack(spacing: 4) {
if let title {
Text(title)
.font(.system(size: 12, weight: .regular))
.font(.ico12)
.tint(foregroundColor ?? .iCoLabel)
}

if let imageName {
Image(systemName: imageName)
.font(.system(size: 10))
.font(.ico10)
.tint(foregroundColor ?? .iCoLabel)

}
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/RoundedRectangleButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct RoundedRectangleButton: View {
}

Text(title)
.font(.system(size: 14, weight: .semibold))
.font(.ico14Sb)
.foregroundStyle(isActive ? .iCoAccent : .iCoLabel)
}
.padding(.horizontal, 14)
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/RoundedRectangleFillButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct RoundedRectangleFillButtonView: View {

Text(title)
.frame(height: 36)
.font(.system(size: 14, weight: !isHighlighted ? .regular : .medium))
.font(!isHighlighted ? .ico14 : .ico14M)
.tint(!isHighlighted ? .iCoLabel : .iCoAccent)
}
.padding(.horizontal, 14)
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/SegmentedControlView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct SegmentedControlView: View {
}
} label: {
Text(tabTitles[idx])
.font(.system(size: 15, weight: selection == idx ? .bold : .regular))
.font(selection == idx ? .ico15B : .ico15)
.frame(maxWidth: .infinity)
.padding(.horizontal, 14)
.padding(.vertical, 8)
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/SortToggleButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct SortToggleButton: View {

HStack {
Text(title)
.font(.system(size: 11))
.font(.ico11)
.foregroundStyle(.iCoLabel)
RoundedButton(imageName: sortOrder.iconName) {
if currentCategory == sortCategory {
Expand Down
6 changes: 3 additions & 3 deletions AIProject/iCo/Features/Base/SubheaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ struct SubheaderView: View {
HStack(spacing: 4) {
if let imageName {
Image(systemName: imageName)
.font(.system(size: 19))
.font(.ico19)
.foregroundStyle(imageColor)
}

Text(subheading)
.font(.system(size: 20, weight: .bold))
.font(.ico20B)
.foregroundStyle(fontColor)
}
if let description {
Text(description)
.font(.system(size: 15))
.font(.ico15)
.foregroundStyle(fontColor)
.lineSpacing(6)
}
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/TimestampWithRefreshButtonView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct TimestampWithRefreshButtonView: View {
Spacer()

Text("\(formattedTime) 기준")
.font(.system(size: 11))
.font(.ico11)
.foregroundStyle(.iCoLabelSecondary)
.contentTransition(.numericText(countsDown: true))

Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Dashboard/View/DashboardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct DashboardView: View {
.background(.ultraThinMaterial)
.overlay(alignment: .center) {
Text("대시보드")
.font(.system(size: 18, weight: .black))
.font(.ico18B)
.foregroundStyle(.iCoLabel)
.offset(y: -5) // 텍스트가 네비게이션바 중앙에 오도록 위치 조정하기
}
Expand Down
15 changes: 8 additions & 7 deletions AIProject/iCo/Features/Dashboard/View/RecommendCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,39 @@ struct RecommendCardView: View {

HStack(spacing: 10) {
Text(recommendCoin.name)
.font(.system(size: 17))
.font(.ico17)
.bold()
.foregroundStyle(.iCoLabel)

Text(recommendCoin.id)
.font(.system(size: 12))
.font(.ico12)
.fontWeight(.semibold)
.foregroundStyle(.iCoLabelSecondary)
}
.padding(.top, 4)

HStack(spacing: 4) {
Text("현재가")
.font(.system(size: 14))
.font(.ico14)
.foregroundStyle(.iCoLabel)

Text(recommendCoin.tradePrice.formatKRW)
.font(.system(size: 14))
.font(.ico14)
.bold()
.foregroundStyle(dynamicStatusColor(for: recommendCoin.changeType))
}
.padding(.top, 1)

HStack(spacing: 4) {
Text("전일대비")
.font(.system(size: 14))
.font(.ico14)
.foregroundStyle(.iCoLabel)

HStack(spacing: 0) {
Group {
Text("\(recommendCoin.changeType.code)\(recommendCoin.changeRate.formatRate)")
}
.font(.system(size: 14))
.font(.ico14)
.bold()
.foregroundStyle(dynamicStatusColor(for: recommendCoin.changeType))
}
Expand All @@ -73,7 +73,7 @@ struct RecommendCardView: View {

VStack {
Text(recommendCoin.comment.byCharWrapping)
.font(.system(size: 14))
.font(.ico14)
.lineSpacing(6)
.foregroundStyle(.iCoLabel)
}
Expand Down Expand Up @@ -107,6 +107,7 @@ struct RecommendCardView: View {
changeType: .rise
)
)
.environmentObject(ThemeManager())
}


4 changes: 2 additions & 2 deletions AIProject/iCo/Features/MyPage/View/BookmarkBulkInsert/HeaderSection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ struct HeaderSection: View {
var body: some View {
VStack(alignment: .leading, spacing: 6) {
Text("코인 목록이 캡쳐된 스크린샷을 업로드하세요")
.font(.system(size: 18))
.font(.ico18)
.fontWeight(.medium)
.multilineTextAlignment(.leading)
.frame(maxWidth: .infinity, alignment: .leading)

Text("아이코가 자동으로 북마크를 등록해드려요")
.foregroundStyle(.iCoLabelSecondary)
.font(.system(size: 15))
.font(.ico15)
.frame(maxWidth: .infinity, alignment: .leading)
}
.padding(.horizontal, 16)
Expand Down