Skip to content

Commit f468648

Browse files
kitcat-skitcat-s
authored
Merge pull request #675 from ESTiOSAI/design/enlarge-font-size
폰트 사이즈 확대
2 parents 5f1a6dc + 7cf2f51 commit f468648

39 files changed

Lines changed: 142 additions & 110 deletions

‎AIProject/iCo/Core/Util/Font+Util.swift‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,24 @@ extension Font {
142142
static var ico21H = Font.dynamic(size: 21, weight: .heavy)
143143
static var ico21Bl = Font.dynamic(size: 21, weight: .black)
144144

145+
// 22pt
146+
static var ico22 = Font.dynamic(size: 22, weight: .regular)
147+
static var ico22L = Font.dynamic(size: 22, weight: .light)
148+
static var ico22M = Font.dynamic(size: 22, weight: .medium)
149+
static var ico22Sb = Font.dynamic(size: 22, weight: .semibold)
150+
static var ico22B = Font.dynamic(size: 22, weight: .bold)
151+
static var ico22H = Font.dynamic(size: 22, weight: .heavy)
152+
static var ico22Bl = Font.dynamic(size: 22, weight: .black)
153+
154+
// 23pt
155+
static var ico23 = Font.dynamic(size: 23, weight: .regular)
156+
static var ico23L = Font.dynamic(size: 23, weight: .light)
157+
static var ico23M = Font.dynamic(size: 23, weight: .medium)
158+
static var ico23Sb = Font.dynamic(size: 23, weight: .semibold)
159+
static var ico23B = Font.dynamic(size: 23, weight: .bold)
160+
static var ico23H = Font.dynamic(size: 23, weight: .heavy)
161+
static var ico23Bl = Font.dynamic(size: 23, weight: .black)
162+
145163
// 24pt
146164
static var ico24 = Font.dynamic(size: 24, weight: .regular)
147165
static var ico24L = Font.dynamic(size: 24, weight: .light)
@@ -151,6 +169,15 @@ extension Font {
151169
static var ico24H = Font.dynamic(size: 24, weight: .heavy)
152170
static var ico24Bl = Font.dynamic(size: 24, weight: .black)
153171

172+
// 26pt
173+
static var ico26 = Font.dynamic(size: 26, weight: .regular)
174+
static var ico26L = Font.dynamic(size: 26, weight: .light)
175+
static var ico26M = Font.dynamic(size: 26, weight: .medium)
176+
static var ico26Sb = Font.dynamic(size: 26, weight: .semibold)
177+
static var ico26B = Font.dynamic(size: 26, weight: .bold)
178+
static var ico26H = Font.dynamic(size: 26, weight: .heavy)
179+
static var ico26Bl = Font.dynamic(size: 26, weight: .black)
180+
154181
// 35pt
155182
static var ico35 = Font.dynamic(size: 35, weight: .regular)
156183
static var ico35L = Font.dynamic(size: 35, weight: .light)

‎AIProject/iCo/Core/Util/String+Util.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ extension String {
116116
/// - searchTerm: 검색어
117117
func highlighted(_ searchTerm: String,
118118
color: Color = .iCoAccent,
119-
font: Font = Font.system(size: 14, weight: .bold)) -> AttributedString {
119+
font: Font = Font.system(size: 16, weight: .bold)) -> AttributedString {
120120
var attributed = AttributedString(self)
121121
let lowercasedText = self.lowercased()
122122
let lowercasedSearch = searchTerm.lowercased()

‎AIProject/iCo/Features/Base/CommonPlaceholderView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct CommonPlaceholderView: View {
3535
.padding(.bottom, 16)
3636

3737
Text(text)
38-
.font(.ico14)
38+
.font(.ico15)
3939
.foregroundStyle(.iCoLabelSecondary)
4040
.lineSpacing(6)
4141
}

‎AIProject/iCo/Features/Base/DefaultProgressView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct DefaultProgressView: View {
8181
.padding(.bottom, 18)
8282

8383
Text(message)
84-
.font(.ico14)
84+
.font(.ico15)
8585
.foregroundColor(.iCoLabel)
8686
.multilineTextAlignment(.center)
8787
.lineSpacing(4)

‎AIProject/iCo/Features/Base/HeaderView.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,28 +72,28 @@ struct HeaderView: View {
7272
VStack(alignment: .leading, spacing: 4) {
7373
HStack(alignment: .center, spacing: 4) {
7474
Text(heading)
75-
.font(heading.count < 11 ? .ico21B : .ico18B)
75+
.font(heading.count < 11 ? .ico22B : .ico19B)
7676
.foregroundStyle(.iCoLabel)
7777
.lineLimit(2)
7878

7979
if showNewBadge {
8080
Text("N")
81-
.font(.ico12H)
81+
.font(.ico13H)
8282
.foregroundStyle(.white)
8383
.padding(4)
8484
.background(Circle().foregroundStyle(.iCoAccent))
8585
}
8686
}
8787

8888
Text(coin)
89-
.font(.ico14B)
89+
.font(.ico16B)
9090
.foregroundStyle(.iCoLabelSecondary)
9191
}
9292
}
9393
} else {
9494
HStack(alignment: .center, spacing: 8) {
9595
Text(heading)
96-
.font(.ico24B)
96+
.font(.ico26B)
9797
.foregroundStyle(headingColor)
9898
.lineLimit(2)
9999
.multilineTextAlignment(showBackButton ? .center : .leading)

‎AIProject/iCo/Features/Base/ReportSectionView.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
6969
// Header
7070
HStack {
7171
Image(systemName: data.icon)
72-
.font(.ico14B)
72+
.font(.ico16B)
7373
.foregroundStyle(.iCoAccent)
7474

7575
Text(data.title)
76-
.font(.ico16B)
76+
.font(.ico18B)
7777
.foregroundStyle(.iCoLabel)
7878

7979
Spacer()
@@ -93,13 +93,13 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
9393
case .success(let value):
9494
if !(Trailing.self == EmptyView.self) {
9595
Text(String.aiGeneratedContentNotice)
96-
.font(.ico11)
96+
.font(.ico13)
9797
.foregroundStyle(.iCoNeutral)
9898
.lineSpacing(5)
9999
}
100100

101101
content(value)
102-
.font(.ico14)
102+
.font(.ico15)
103103
.foregroundStyle(.iCoLabel)
104104
.lineSpacing(6)
105105
.fixedSize(horizontal: false, vertical: true)
@@ -226,7 +226,7 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
226226
trailing: { value in
227227
Button(action: { UIPasteboard.general.string = value }) {
228228
Image(systemName: "doc.on.doc")
229-
.font(.ico14Sb)
229+
.font(.ico16Sb)
230230
}
231231
.buttonStyle(.plain)
232232
.accessibilityLabel("내용 복사")

‎AIProject/iCo/Features/Base/RoundedButton.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ struct RoundedButton: View {
3131
HStack(spacing: 4) {
3232
if let title {
3333
Text(title)
34-
.font(.ico11)
34+
.font(.ico14)
3535
.tint(foregroundColor ?? .iCoLabel)
3636
}
3737

3838
if let imageName {
3939
Image(systemName: imageName)
40-
.font(.ico10)
40+
.font(.ico13)
4141
.tint(foregroundColor ?? .iCoLabelSecondary)
4242
.rotation3DEffect(
4343
.degrees(isRotated ? 180 : 0),

‎AIProject/iCo/Features/Base/RoundedRectangleButton.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct RoundedRectangleButton: View {
3838
}
3939

4040
Text(title)
41-
.font(.ico14Sb)
41+
.font(.ico16Sb)
4242
.foregroundStyle(isActive ? .iCoAccent : .iCoLabel)
4343
}
4444
.padding(.horizontal, 14)

‎AIProject/iCo/Features/Base/RoundedRectangleFillButton.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct RoundedRectangleFillButtonView: View {
5454

5555
Text(title)
5656
.frame(height: 36)
57-
.font(!isHighlighted ? .ico14 : .ico14M)
57+
.font(!isHighlighted ? .ico16 : .ico16M)
5858
.tint(!isHighlighted ? .iCoLabel : .iCoAccent)
5959
}
6060
.padding(.horizontal, 14)

‎AIProject/iCo/Features/Base/SegmentedControlView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ struct SegmentedControlView: View {
4040
.frame(maxWidth: .infinity)
4141
.padding(.horizontal, 14)
4242
.padding(.vertical, 8)
43-
.foregroundColor(selection == idx ? .iCoBackgroundWhite : .iCoLabelSecondary)
43+
.foregroundColor(selection == idx ? .white : .iCoLabelSecondary)
4444
.background(
4545
ZStack {
4646
if selection == idx {

0 commit comments

Comments
 (0)