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

커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디

Browse Source 
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
Yu Sung
2026-01-23 03:09:20 +09:00
parent d92dcbc696
commit 280e424385
238 changed files with 831 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,7 @@ struct CanChargeView: View {
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color(hex: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
@@ -213,7 +213,7 @@ struct CanChargeTab: View {
Spacer()
Text(title)
.font(.custom(Font.medium.rawValue, size: 16.7))
.appFont(size: 16.7, weight: .medium)
.foregroundColor(color())
.frame(width: width)

4
SodaLive/Sources/MyPage/Can/Coupon/CanCouponNoticeItemView.swift
View File

@@ -14,12 +14,12 @@ struct CanCouponNoticeItemView: View {
var body: some View {
HStack(alignment: .top, spacing: 4) {
Text("-")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Text(notice)
.multilineTextAlignment(.leading)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.fixedSize(horizontal: false, vertical: true)
}

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

@@ -30,7 +30,7 @@ struct CanCouponView: View {
.autocapitalization(.allCharacters) // Force uppercase keyboard
.textContentType(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.padding(.vertical, 16.7)
.padding(.horizontal, 13.3)
@@ -94,7 +94,7 @@ struct CanCouponView: View {
.padding(.top, 4)
Text(I18n.CanCoupon.contactHelp)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.grayee)
.fixedSize(horizontal: false, vertical: true)
.padding(.top, 26.7)
@@ -117,7 +117,7 @@ struct CanCouponView: View {
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

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

@@ -64,7 +64,7 @@ struct CanPaymentView: View {
.frame(width: 20, height: 20)
Text("구매조건 확인 및 결제 진행 동의")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
}
.frame(width: screenSize().width - 53.4, alignment: .leading)
@@ -76,11 +76,11 @@ struct CanPaymentView: View {
VStack(spacing: 6.7) {
HStack(alignment: .top, spacing: 0) {
Text("- ")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "777777"))
Text("결제 취소는 결제 후 7일 이내에만 할 수 있습니다.\n단, 캔의 일부를 사용하면 결제 취소를 할 수 없습니다.")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "777777"))
.fixedSize(horizontal: false, vertical: true)
}
@@ -88,11 +88,11 @@ struct CanPaymentView: View {
HStack(alignment: .top, spacing: 0) {
Text("- ")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "777777"))
Text("광고성 이벤트 등 회사가 무료로 지급한 포인트는 환불되지 않습니다.")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "777777"))
.fixedSize(horizontal: false, vertical: true)
}
@@ -100,11 +100,11 @@ struct CanPaymentView: View {
HStack(alignment: .top, spacing: 0) {
Text("- ")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "777777"))
Text("자세한 내용은 보이스온 이용약관에서 확인할 수 있습니다.")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "777777"))
.fixedSize(horizontal: false, vertical: true)
}
@@ -119,7 +119,7 @@ struct CanPaymentView: View {
HStack(spacing: 0) {
VStack(alignment: .leading, spacing: 5) {
Text("결제금액")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
HStack(spacing: 0) {
@@ -169,7 +169,7 @@ struct CanPaymentView: View {
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color(hex: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
@@ -195,7 +195,7 @@ struct CanPaymentView: View {
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color(hex: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
@@ -214,7 +214,7 @@ struct CanPaymentView: View {
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color(hex: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

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

@@ -210,7 +210,7 @@ struct CanPgPaymentView: View {
.frame(width: 20, height: 20)
Text("구매조건 확인 및 결제 진행 동의")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
}
.frame(width: screenSize().width - 53.4, alignment: .leading)
@@ -222,11 +222,11 @@ struct CanPgPaymentView: View {
VStack(spacing: 6.7) {
HStack(alignment: .top, spacing: 0) {
Text("- ")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
Text("충전된 캔의 유효기간은 충전 후 5년 입니다.")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
.fixedSize(horizontal: false, vertical: true)
}
@@ -235,11 +235,11 @@ struct CanPgPaymentView: View {
HStack(alignment: .top, spacing: 0) {
Text("- ")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
Text("결제 취소는 결제 후 7일 이내에만 할 수 있습니다.\n단, 캔의 일부를 사용하면 결제 취소를 할 수 없습니다.")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
.fixedSize(horizontal: false, vertical: true)
}
@@ -247,11 +247,11 @@ struct CanPgPaymentView: View {
HStack(alignment: .top, spacing: 0) {
Text("- ")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
Text("광고성 이벤트 등 회사가 무료로 지급한 포인트는 환불되지 않습니다.")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
.fixedSize(horizontal: false, vertical: true)
}
@@ -259,11 +259,11 @@ struct CanPgPaymentView: View {
HStack(alignment: .top, spacing: 0) {
Text("- ")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
Text("자세한 내용은 보이스온 이용약관에서 확인할 수 있습니다.")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
.fixedSize(horizontal: false, vertical: true)
}
@@ -277,7 +277,7 @@ struct CanPgPaymentView: View {
HStack(spacing: 0) {
VStack(alignment: .leading, spacing: 5) {
Text("결제금액")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
HStack(spacing: 0) {
@@ -345,7 +345,7 @@ struct CanPgPaymentView: View {
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

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

@@ -179,7 +179,7 @@ struct CanPaymentTempView: View {
.frame(width: 20, height: 20)
Text("구매조건 확인 및 결제 진행 동의")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
}
.frame(width: screenSize().width - 53.4, alignment: .leading)
@@ -195,7 +195,7 @@ struct CanPaymentTempView: View {
HStack(spacing: 0) {
VStack(alignment: .leading, spacing: 5) {
Text("결제금액")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
HStack(spacing: 0) {
@@ -252,7 +252,7 @@ struct CanPaymentTempView: View {
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

6
SodaLive/Sources/MyPage/Can/Status/CanChargeStatusView.swift
View File

@@ -37,18 +37,18 @@ struct CanChargeStatusItemView: View {
HStack(spacing: 0) {
VStack(alignment: .leading, spacing: 6.7) {
Text(item.canTitle)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Text(item.date)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "777777"))
}
Spacer()
Text(item.chargeMethod)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
}
.padding(.horizontal, 13.3)

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

@@ -45,7 +45,7 @@ struct CanStatusView: View {
.foregroundColor(Color(hex: "eeeeee"))
Text(" 캔")
.font(.custom(Font.medium.rawValue, size: 10.7))
.appFont(size: 10.7, weight: .medium)
.foregroundColor(Color(hex: "bbbbbb"))
}
}
@@ -66,7 +66,7 @@ struct CanStatusView: View {
.foregroundColor(Color(hex: "eeeeee"))
Text(" 캔")
.font(.custom(Font.medium.rawValue, size: 10.7))
.appFont(size: 10.7, weight: .medium)
.foregroundColor(Color(hex: "bbbbbb"))
}
}
@@ -83,7 +83,7 @@ struct CanStatusView: View {
VStack(spacing: 0) {
Spacer()
Text("충전내역")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(
Color(hex: viewModel.currentTab == .charge ? "eeeeee" : "777777")
)
@@ -105,7 +105,7 @@ struct CanStatusView: View {
VStack(spacing: 0) {
Spacer()
Text("사용내역")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(
Color(hex: viewModel.currentTab == .use ? "eeeeee" : "777777")
)
@@ -175,7 +175,7 @@ struct CanStatusView: View {
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color(hex: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

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

@@ -37,11 +37,11 @@ struct CanUseStatusItemView: View {
HStack(spacing: 0) {
VStack(alignment: .leading, spacing: 6.7) {
Text(item.title)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Text(item.date)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "777777"))
}