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
27 changes: 27 additions & 0 deletions AIProject/iCo/Core/Util/Font+Util.swift
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,24 @@ extension Font {
static var ico21H = Font.dynamic(size: 21, weight: .heavy)
static var ico21Bl = Font.dynamic(size: 21, weight: .black)

// 22pt
static var ico22 = Font.dynamic(size: 22, weight: .regular)
static var ico22L = Font.dynamic(size: 22, weight: .light)
static var ico22M = Font.dynamic(size: 22, weight: .medium)
static var ico22Sb = Font.dynamic(size: 22, weight: .semibold)
static var ico22B = Font.dynamic(size: 22, weight: .bold)
static var ico22H = Font.dynamic(size: 22, weight: .heavy)
static var ico22Bl = Font.dynamic(size: 22, weight: .black)

// 23pt
static var ico23 = Font.dynamic(size: 23, weight: .regular)
static var ico23L = Font.dynamic(size: 23, weight: .light)
static var ico23M = Font.dynamic(size: 23, weight: .medium)
static var ico23Sb = Font.dynamic(size: 23, weight: .semibold)
static var ico23B = Font.dynamic(size: 23, weight: .bold)
static var ico23H = Font.dynamic(size: 23, weight: .heavy)
static var ico23Bl = Font.dynamic(size: 23, weight: .black)

// 24pt
static var ico24 = Font.dynamic(size: 24, weight: .regular)
static var ico24L = Font.dynamic(size: 24, weight: .light)
Expand All @@ -151,6 +169,15 @@ extension Font {
static var ico24H = Font.dynamic(size: 24, weight: .heavy)
static var ico24Bl = Font.dynamic(size: 24, weight: .black)

// 26pt
static var ico26 = Font.dynamic(size: 26, weight: .regular)
static var ico26L = Font.dynamic(size: 26, weight: .light)
static var ico26M = Font.dynamic(size: 26, weight: .medium)
static var ico26Sb = Font.dynamic(size: 26, weight: .semibold)
static var ico26B = Font.dynamic(size: 26, weight: .bold)
static var ico26H = Font.dynamic(size: 26, weight: .heavy)
static var ico26Bl = Font.dynamic(size: 26, weight: .black)

// 35pt
static var ico35 = Font.dynamic(size: 35, weight: .regular)
static var ico35L = Font.dynamic(size: 35, weight: .light)
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Core/Util/String+Util.swift
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ extension String {
/// - searchTerm: 검색어
func highlighted(_ searchTerm: String,
color: Color = .iCoAccent,
font: Font = Font.system(size: 14, weight: .bold)) -> AttributedString {
font: Font = Font.system(size: 16, weight: .bold)) -> AttributedString {
var attributed = AttributedString(self)
let lowercasedText = self.lowercased()
let lowercasedSearch = searchTerm.lowercased()
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/CommonPlaceholderView.swift
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(.ico14)
.font(.ico15)
.foregroundStyle(.iCoLabelSecondary)
.lineSpacing(6)
}
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/DefaultProgressView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ struct DefaultProgressView: View {
.padding(.bottom, 18)

Text(message)
.font(.ico14)
.font(.ico15)
.foregroundColor(.iCoLabel)
.multilineTextAlignment(.center)
.lineSpacing(4)
Expand Down
8 changes: 4 additions & 4 deletions AIProject/iCo/Features/Base/HeaderView.swift
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(heading.count < 11 ? .ico21B : .ico18B)
.font(heading.count < 11 ? .ico22B : .ico19B)
.foregroundStyle(.iCoLabel)
.lineLimit(2)

if showNewBadge {
Text("N")
.font(.ico12H)
.font(.ico13H)
.foregroundStyle(.white)
.padding(4)
.background(Circle().foregroundStyle(.iCoAccent))
}
}

Text(coin)
.font(.ico14B)
.font(.ico16B)
.foregroundStyle(.iCoLabelSecondary)
}
}
} else {
HStack(alignment: .center, spacing: 8) {
Text(heading)
.font(.ico24B)
.font(.ico26B)
.foregroundStyle(headingColor)
.lineLimit(2)
.multilineTextAlignment(showBackButton ? .center : .leading)
Expand Down
10 changes: 5 additions & 5 deletions AIProject/iCo/Features/Base/ReportSectionView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
// Header
HStack {
Image(systemName: data.icon)
.font(.ico14B)
.font(.ico16B)
.foregroundStyle(.iCoAccent)

Text(data.title)
.font(.ico16B)
.font(.ico18B)
.foregroundStyle(.iCoLabel)

Spacer()
Expand All @@ -93,13 +93,13 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
case .success(let value):
if !(Trailing.self == EmptyView.self) {
Text(String.aiGeneratedContentNotice)
.font(.ico11)
.font(.ico13)
.foregroundStyle(.iCoNeutral)
.lineSpacing(5)
}

content(value)
.font(.ico14)
.font(.ico15)
.foregroundStyle(.iCoLabel)
.lineSpacing(6)
.fixedSize(horizontal: false, vertical: true)
Expand Down Expand Up @@ -226,7 +226,7 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
trailing: { value in
Button(action: { UIPasteboard.general.string = value }) {
Image(systemName: "doc.on.doc")
.font(.ico14Sb)
.font(.ico16Sb)
}
.buttonStyle(.plain)
.accessibilityLabel("내용 복사")
Expand Down
4 changes: 2 additions & 2 deletions AIProject/iCo/Features/Base/RoundedButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ struct RoundedButton: View {
HStack(spacing: 4) {
if let title {
Text(title)
.font(.ico11)
.font(.ico14)
.tint(foregroundColor ?? .iCoLabel)
}

if let imageName {
Image(systemName: imageName)
.font(.ico10)
.font(.ico13)
.tint(foregroundColor ?? .iCoLabelSecondary)
.rotation3DEffect(
.degrees(isRotated ? 180 : 0),
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/RoundedRectangleButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct RoundedRectangleButton: View {
}

Text(title)
.font(.ico14Sb)
.font(.ico16Sb)
.foregroundStyle(isActive ? .iCoAccent : .iCoLabel)
}
.padding(.horizontal, 14)
Expand Down
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(!isHighlighted ? .ico14 : .ico14M)
.font(!isHighlighted ? .ico16 : .ico16M)
.tint(!isHighlighted ? .iCoLabel : .iCoAccent)
}
.padding(.horizontal, 14)
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/SegmentedControlView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct SegmentedControlView: View {
.frame(maxWidth: .infinity)
.padding(.horizontal, 14)
.padding(.vertical, 8)
.foregroundColor(selection == idx ? .iCoBackgroundWhite : .iCoLabelSecondary)
.foregroundColor(selection == idx ? .white : .iCoLabelSecondary)
.background(
ZStack {
if selection == idx {
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/SortToggleButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct SortToggleButton: View {

HStack {
Text(title)
.font(.ico11)
.font(.ico13)
.foregroundStyle(.iCoLabel)
RoundedButton(imageName: sortOrder.iconName) {
if currentCategory == sortCategory {
Expand Down
6 changes: 3 additions & 3 deletions AIProject/iCo/Features/Base/SubheaderView.swift
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(.ico19)
.font(.ico21)
.foregroundStyle(imageColor)
}

Text(subheading)
.font(.ico20B)
.font(.ico23B)
.foregroundStyle(fontColor)
}
if let description {
Text(description)
.font(.ico15)
.font(.ico17)
.foregroundStyle(fontColor)
.lineSpacing(6)
.fixedSize(horizontal: false, vertical: true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct TimestampWithRefreshButtonView: View {
Spacer()

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

Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/ChatBot/View/BotMessageView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct BotMessageView: View {
}
}
.foregroundStyle(.iCoLabel)
.font(.ico14)
.font(.ico16)
.lineSpacing(6)
.padding(.vertical, 15)
.padding(.horizontal, 18)
Expand Down
6 changes: 3 additions & 3 deletions AIProject/iCo/Features/ChatBot/View/ChatBotFAQView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct ChatBotFAQView: View {
VStack(spacing: 15) {
HStack {
Text("안녕하세요, 아이코 챗봇입니다.\n궁금하신 내용을 선택해주세요.")
.font(.ico15)
.font(.ico17)
Spacer()
}

Expand All @@ -51,7 +51,7 @@ struct ChatBotFAQView: View {
}
.frame(maxWidth: .infinity)
.padding(.vertical, 10)
.font(.ico14)
.font(.ico16)
.background(.iCoBackgroundAccent)
.clipShape(RoundedRectangle(cornerRadius: 15))
.overlay(RoundedRectangle(cornerRadius: 15).strokeBorder(.accentGradient, lineWidth: 0.5))
Expand All @@ -60,7 +60,7 @@ struct ChatBotFAQView: View {
}
}
.foregroundStyle(.iCoLabel)
.font(.ico14)
.font(.ico16)
.lineSpacing(6)
.padding(.vertical, 15)
.padding(.horizontal, 18)
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/ChatBot/View/ChatInputView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct ChatInputView: View {
HStack {
TextField("무엇이든 물어보세요.", text: $viewModel.searchText, axis: .vertical)
.lineLimit(1...3)
.font(.ico14)
.font(.ico16)
.foregroundStyle(.iCoLabel)
.focused($isFocused)

Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/ChatBot/View/UserMessageView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct UserMessageView: View {
HStack {
Spacer()
Text(content)
.font(.ico14)
.font(.ico16)
.lineSpacing(6)
.foregroundStyle(.iCoLabel)
.padding(.vertical, 15)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ struct CandleChartView: View {
if date <= visibleRight {
AxisValueLabel {
Text(timeFormatter.string(from: date))
.font(.ico11)
.font(.ico13)
.lineLimit(1)
.minimumScaleFactor(0.75)
.dynamicTypeSize(.xSmall ... .medium)
Expand Down
8 changes: 4 additions & 4 deletions AIProject/iCo/Features/CoinDetail/View/ChartView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -111,23 +111,23 @@ struct ChartView: View {
/// 기준 시간 / 현재가 / 등락가, 등락률 / 거래대금
VStack(alignment: .leading, spacing: 8) {
Text(lastUpdatedText)
.font(.ico10)
.font(.ico12)
.foregroundStyle(.iCoLabel)
.lineLimit(1)

Text(viewModel.displayLastPrice.formatKRW)
.font(.ico20B)
.font(.ico22B)
.foregroundStyle(.iCoLabel)
.lineLimit(1)

Text("\(sign)\(absChange.formatKRW) (\(arrow)\(abs(viewModel.displayChangeRate).formatRate))")
.font(.ico16M)
.font(.ico18M)
.foregroundStyle(headerColor)
.lineLimit(2)
.multilineTextAlignment(.leading)

Text("거래대금 \(viewModel.headerAccTradePrice.formatMillion)")
.font(.ico12M)
.font(.ico15M)
.foregroundStyle(.iCoLabelSecondary)
.lineLimit(1)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ struct ReportNewsSectionView: View {
var body: some View {
VStack(alignment: .leading, spacing: 0) {
Text(title)
.font(.ico13B)
.font(.ico15B)
.foregroundStyle(.iCoAccent)

ForEach(displayedArticles, id: \.id) { article in
VStack(alignment: .leading, spacing: 8) {
HStack {
Text(article.title.byCharWrapping)
.font(.ico15B)
.font(.ico17B)
.foregroundStyle(.iCoLabel)
.lineLimit(1)

Expand All @@ -50,7 +50,7 @@ struct ReportNewsSectionView: View {
}

Text(article.summary.byCharWrapping)
.font(.ico14)
.font(.ico15)
.foregroundStyle(.iCoLabel)
.lineSpacing(6)
.fixedSize(horizontal: false, vertical: true)
Expand Down
4 changes: 2 additions & 2 deletions AIProject/iCo/Features/CoinDetail/View/ReportView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ struct ReportView: View {
VStack(alignment: .leading, spacing: 16) {
if hSizeClass == .regular {
Text("AI 리포트")
.font(.ico18B)
.font(.ico20B)
.foregroundStyle(.iCoLabel)
}

Text(String.aiGeneratedContentNotice)
.font(.ico11)
.font(.ico13)
.foregroundStyle(.iCoNeutral)
.lineSpacing(5)

Expand Down
4 changes: 2 additions & 2 deletions AIProject/iCo/Features/Dashboard/View/AIBriefingView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct AIBriefingView: View {
SubheaderView(subheading: "시장 한눈에 보기")
.padding(.bottom, 4)

VStack(alignment: .leading, spacing: 20) {
VStack(alignment: .leading, spacing: 16) {
FearGreedView()

VStack(spacing: 16) {
Expand Down Expand Up @@ -63,7 +63,7 @@ struct AIBriefingView: View {
data: data,
trailing: {
Text($0.sentiment.rawValue)
.font(.ico16B)
.font(.ico18B)
.foregroundStyle($0.sentiment.color(for: themeManager.selectedTheme))
},
content: {
Expand Down
Loading