klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

커스텀 폰트 pretendard-bold, gmarket-bold를 사용하고 있던 것을 appFont 모디파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정

Browse Source
This commit is contained in:
Yu Sung
2026-01-23 02:57:23 +09:00
parent 5a344956e3
commit d92dcbc696
181 changed files with 500 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift
View File

@@ -95,13 +95,13 @@ struct CanItemView: View {
var body: some View {
HStack(spacing: 0) {
Text(localizeCanWord(in: item.localizedTitle))
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
Spacer()
Text("\(NumberFormatter.localizedString(from: item.price, number: .currency))")
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
}
.padding(.horizontal, 13.3)
@@ -119,13 +119,13 @@ struct CanPgItemView: View {
var body: some View {
HStack(spacing: 0) {
Text(localizeCanWord(in: item.title))
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
Spacer()
Text(item.priceStr.formatCurrency(currencyCode: item.currency))
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
}
.padding(.horizontal, 13.3)

2
SodaLive/Sources/MyPage/Can/Coupon/CanChargeCouponButtonView.swift
View File

@@ -11,7 +11,7 @@ struct CanChargeCouponButtonView: View {
var body: some View {
HStack(spacing: 5.3) {
Text("쿠폰 등록")
.font(.custom(Font.bold.rawValue, size: 16))
.appFont(size: 16, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
Image("ic_coupon")

8
SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift
View File

@@ -22,7 +22,7 @@ struct CanCouponView: View {
ScrollView(.vertical, showsIndicators: false) {
VStack(spacing: 0) {
Text(I18n.CanCoupon.inputTitle)
.font(.custom(Font.bold.rawValue, size: 16.7))
.appFont(size: 16.7, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
.frame(maxWidth: .infinity, alignment: .leading)
@@ -46,7 +46,7 @@ struct CanCouponView: View {
}
Text(I18n.CanCoupon.submit)
.font(.custom(Font.bold.rawValue, size: 18.3))
.appFont(size: 18.3, weight: .bold)
.foregroundColor(.white)
.padding(.vertical, 16)
.frame(maxWidth: .infinity)
@@ -59,7 +59,7 @@ struct CanCouponView: View {
VStack(alignment: .leading, spacing: 0) {
Text(I18n.CanCoupon.guideHeader)
.font(.custom(Font.bold.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .bold)
.foregroundColor(.grayee)
CanCouponNoticeItemView(notice: I18n.CanCoupon.guide1)
@@ -78,7 +78,7 @@ struct CanCouponView: View {
.padding(.vertical, 26.7)
Text(I18n.CanCoupon.cautionHeader)
.font(.custom(Font.bold.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .bold)
.foregroundColor(.grayee)
CanCouponNoticeItemView(notice: I18n.CanCoupon.caution1)

8
SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift
View File

@@ -40,14 +40,14 @@ struct CanPaymentView: View {
.frame(width: 26.7, height: 26.7, alignment: .top)
Text(canProduct.localizedTitle)
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
.padding(.leading, 13.3)
Spacer()
Text("\(NumberFormatter.localizedString(from: canProduct.price, number: .currency))")
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
}
.padding(.horizontal, 13.3)
@@ -124,7 +124,7 @@ struct CanPaymentView: View {
HStack(spacing: 0) {
Text("\(NumberFormatter.localizedString(from: canProduct.price, number: .currency))")
.font(.custom(Font.bold.rawValue, size: 23.3))
.appFont(size: 23.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
}
}
@@ -132,7 +132,7 @@ struct CanPaymentView: View {
Spacer()
Text("결제하기")
.font(.custom(Font.bold.rawValue, size: 18.3))
.appFont(size: 18.3, weight: .bold)
.foregroundColor(.white)
.padding(.vertical, 16)
.frame(minWidth: 200)

12
SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift
View File

@@ -73,7 +73,7 @@ struct CanPgPaymentView: View {
HStack(spacing: 8) {
Button(action: { showExitConfirm = true }) {
Text("닫기")
.font(.custom(Font.bold.rawValue, size: 14))
.appFont(size: 14, weight: .bold)
.foregroundColor(.white)
.padding(.horizontal, 12)
.padding(.vertical, 8)
@@ -111,14 +111,14 @@ struct CanPgPaymentView: View {
.frame(width: 26.7, height: 26.7, alignment: .top)
Text(canResponse.title)
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
.padding(.leading, 13.3)
Spacer()
Text(canResponse.priceStr.formatCurrency(currencyCode: canResponse.currency))
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color.grayee)
}
.padding(.horizontal, 13.3)
@@ -130,7 +130,7 @@ struct CanPgPaymentView: View {
.padding(.top, 13.3)
Text("결제 수단 선택")
.font(.custom(Font.bold.rawValue, size: 16.7))
.appFont(size: 16.7, weight: .bold)
.foregroundColor(Color.grayee)
.frame(width: screenSize().width - 26.7, alignment: .leading)
.padding(.top, 26.7)
@@ -282,7 +282,7 @@ struct CanPgPaymentView: View {
HStack(spacing: 0) {
Text(canResponse.priceStr.formatCurrency(currencyCode: canResponse.currency))
.font(.custom(Font.bold.rawValue, size: 23.3))
.appFont(size: 23.3, weight: .bold)
.foregroundColor(Color.grayee)
}
}
@@ -290,7 +290,7 @@ struct CanPgPaymentView: View {
Spacer()
Text("결제하기")
.font(.custom(Font.bold.rawValue, size: 18.3))
.appFont(size: 18.3, weight: .bold)
.foregroundColor(.white)
.padding(.vertical, 16)
.frame(minWidth: 200)

10
SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift
View File

@@ -71,14 +71,14 @@ struct CanPaymentTempView: View {
VStack(spacing: 0) {
HStack(spacing: 0) {
Text(self.title)
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
.padding(.leading, 13.3)
Spacer()
Text("\(self.can * 110) 원")
.font(.custom(Font.bold.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .bold)
.foregroundColor(Color.grayee)
}
.padding(.horizontal, 13.3)
@@ -90,7 +90,7 @@ struct CanPaymentTempView: View {
.padding(.top, 13.3)
Text("결제 수단 선택")
.font(.custom(Font.bold.rawValue, size: 16.7))
.appFont(size: 16.7, weight: .bold)
.foregroundColor(Color.grayee)
.frame(width: screenSize().width - 26.7, alignment: .leading)
.padding(.top, 26.7)
@@ -200,7 +200,7 @@ struct CanPaymentTempView: View {
HStack(spacing: 0) {
Text("\(self.can * 110) 원")
.font(.custom(Font.bold.rawValue, size: 23.3))
.appFont(size: 23.3, weight: .bold)
.foregroundColor(Color.grayee)
}
}
@@ -208,7 +208,7 @@ struct CanPaymentTempView: View {
Spacer()
Text("결제하기")
.font(.custom(Font.bold.rawValue, size: 18.3))
.appFont(size: 18.3, weight: .bold)
.foregroundColor(.white)
.padding(.vertical, 16)
.frame(minWidth: 200)

8
SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift
View File

@@ -29,7 +29,7 @@ struct CanStatusView: View {
.frame(width: 26.7, height: 26.7)
Text("\(viewModel.totalCan)")
.font(.custom(Font.bold.rawValue, size: 18.3))
.appFont(size: 18.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
}
@@ -41,7 +41,7 @@ struct CanStatusView: View {
HStack(alignment: .bottom, spacing: 3.3) {
Text("\(viewModel.chargeCan)")
.font(.custom(Font.bold.rawValue, size: 16.7))
.appFont(size: 16.7, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
Text(" 캔")
@@ -62,7 +62,7 @@ struct CanStatusView: View {
HStack(alignment: .bottom, spacing: 3.3) {
Text("\(viewModel.rewardCan)")
.font(.custom(Font.bold.rawValue, size: 16.7))
.appFont(size: 16.7, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
Text(" 캔")
@@ -143,7 +143,7 @@ struct CanStatusView: View {
.frame(width: 26.7, height: 26.7)
Text("충전하기")
.font(.custom(Font.bold.rawValue, size: 18.3))
.appFont(size: 18.3, weight: .bold)
.foregroundColor(Color(hex: "1313bc"))
}
.padding(.vertical, 16)

2
SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift
View File

@@ -48,7 +48,7 @@ struct CanUseStatusItemView: View {
Spacer()
Text("\(item.can)")
.font(.custom(Font.bold.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .bold)
.foregroundColor(Color(hex: "eeeeee"))
Image("ic_can")