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

10
SodaLive/Sources/MyPage/Block/BlockMemberListView.swift
View File

@@ -18,15 +18,15 @@ struct BlockMemberListView: View {
HStack(spacing: 0) {
Text("총")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
Text(" \(viewModel.totalCount) ")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.mainRed3)
Text("명")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
Spacer()
@@ -57,7 +57,7 @@ struct BlockMemberListView: View {
}
} else {
Text("차단한 유저가 없습니다.")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
.frame(maxHeight: .infinity)
}
@@ -71,7 +71,7 @@ struct BlockMemberListView: View {
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().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)

4
SodaLive/Sources/MyPage/Block/BlockedMemberListItemView.swift
View File

@@ -32,14 +32,14 @@ struct BlockedMemberListItemView: View {
.clipShape(Circle())
Text(item.nickname)
.font(.custom(Font.medium.rawValue, size: 16.7))
.appFont(size: 16.7, weight: .medium)
.foregroundColor(Color.grayee)
.padding(.leading, 13.3)
Spacer()
Text(isBlocked ? "차단해제" : "차단")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.button)
.frame(minWidth: 83)
.padding(.vertical, 7)

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"))
}

2
SodaLive/Sources/MyPage/MyPageView.swift
View File

@@ -175,7 +175,7 @@ struct MyPageView: View {
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.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(.center)

8
SodaLive/Sources/MyPage/OrderList/OrderListAllInnerView.swift
View File

@@ -15,15 +15,15 @@ struct OrderListAllInnerView: View {
VStack(spacing: 0) {
HStack(spacing: 0) {
Text("총")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Text(" \(viewModel.totalCount) ")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "dd4500"))
Text("개")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Spacer()
@@ -66,7 +66,7 @@ struct OrderListAllInnerView: View {
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color(hex: "3bb9f1"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

14
SodaLive/Sources/MyPage/OrderList/OrderListItemView.swift
View File

@@ -31,14 +31,14 @@ struct OrderListItemView: View {
VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 8) {
Text(item.themeStr)
.font(.custom(Font.medium.rawValue, size: 8))
.appFont(size: 8, weight: .medium)
.foregroundColor(Color(hex: "3bac6a"))
.padding(2.6)
.background(Color(hex: "28312b"))
.cornerRadius(2.6)
Text(item.duration!)
.font(.custom(Font.medium.rawValue, size: 8))
.appFont(size: 8, weight: .medium)
.foregroundColor(Color(hex: "777777"))
.padding(2.6)
.background(Color(hex: "222222"))
@@ -46,12 +46,12 @@ struct OrderListItemView: View {
}
Text(item.creatorNickname)
.font(.custom(Font.medium.rawValue, size: 9))
.appFont(size: 9, weight: .medium)
.foregroundColor(Color(hex: "777777"))
.padding(.top, 2.6)
Text(item.title)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "d2d2d2"))
.fixedSize(horizontal: false, vertical: true)
.padding(.top, 2.6)
@@ -64,7 +64,7 @@ struct OrderListItemView: View {
.frame(width: 13.3, height: 13.3)
Text("\(item.likeCount)")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(Color(hex: "777777"))
}
@@ -74,7 +74,7 @@ struct OrderListItemView: View {
.frame(width: 13.3, height: 13.3)
Text("\(item.commentCount)")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(Color(hex: "777777"))
}
}
@@ -83,7 +83,7 @@ struct OrderListItemView: View {
Spacer()
Text(item.orderType == .RENTAL ? "대여중" : "소장중")
.font(.custom(Font.medium.rawValue, size: 10.3))
.appFont(size: 10.3, weight: .medium)
.foregroundColor(item.orderType == .RENTAL ? .white : .black)
.padding(.horizontal, 5.3)
.padding(.vertical, 2.7)

2
SodaLive/Sources/MyPage/OrderList/OrderListView.swift
View File

@@ -20,7 +20,7 @@ struct OrderListView: View {
Spacer()
Text("전체보기")
.font(.custom(Font.medium.rawValue, size: 11))
.appFont(size: 11, weight: .medium)
.foregroundColor(Color.graybb)
.onTapGesture {
AppState.shared.setAppStep(step: .orderListAll)

8
SodaLive/Sources/MyPage/Point/PointStatusView.swift
View File

@@ -41,7 +41,7 @@ struct PointStatusView: View {
.padding(.top, 13.3)
Text("※ 획득한 포인트는 72시간이 지나면 자동소멸 됩니다.")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.grayee)
.padding(.top, 13.3)
@@ -49,7 +49,7 @@ struct PointStatusView: View {
VStack(spacing: 0) {
Spacer()
Text("받은내역")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(viewModel.currentTab == .reward ? .grayee : .gray77)
Spacer()
Rectangle()
@@ -70,7 +70,7 @@ struct PointStatusView: View {
VStack(spacing: 0) {
Spacer()
Text("사용내역")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(viewModel.currentTab == .use ? .grayee : .gray77)
Spacer()
Rectangle()
@@ -118,7 +118,7 @@ struct PointStatusView: 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/Point/Reward/PointRewardStatusView.swift
View File

@@ -38,18 +38,18 @@ struct PointRewardStatusItemView: View {
HStack(spacing: 0) {
VStack(alignment: .leading, spacing: 6.7) {
Text(item.rewardPoint)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.grayee)
Text(item.date)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(.gray77)
}
Spacer()
Text(item.method)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.grayee)
}
.padding(.horizontal, 13.3)

6
SodaLive/Sources/MyPage/Point/Use/PointUseStatusView.swift
View File

@@ -38,18 +38,18 @@ struct PointUseStatusItemView: 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(.grayee)
Text(item.date)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(.gray77)
}
Spacer()
Text("\(item.point)")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.grayee)
Image("ic_point")

6
SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift
View File

@@ -20,14 +20,14 @@ struct NicknameUpdateView: View {
Text("닉네임 변경으로 인해 피해를 입는 사용자가 지속적으로 발생하여 닉네임 변경을 부득이하게 유료로 전환합니다.")
.fixedSize(horizontal: false, vertical: true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.frame(width: screenSize().width - 40, alignment: .leading)
.padding(.top, 40)
Text("최초 1회에 한해서 무료로 변경이 가능하고, 그 이후부터는 유료로 전환됩니다.")
.fixedSize(horizontal: false, vertical: true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "dd4500"))
.frame(width: screenSize().width - 40, alignment: .leading)
@@ -94,7 +94,7 @@ struct NicknameUpdateView: 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/Profile/Password/ModifyPasswordView.swift
View File

@@ -20,7 +20,7 @@ struct ModifyPasswordView: View {
ScrollView(.vertical, showsIndicators: false) {
Text("안전한 비밀번호로 내 내 정보를 보호하세요")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
.padding(.top, 40)
@@ -50,7 +50,7 @@ struct ModifyPasswordView: View {
.frame(width: screenSize().width - 53.4)
Text("* 영문, 숫자 포함 8자 이상")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.mainRed3)
.frame(width: screenSize().width - 53.4, alignment: .leading)
.padding(.top, 13.7)
@@ -94,7 +94,7 @@ struct ModifyPasswordView: 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/Profile/ProfileUpdateView.swift
View File

@@ -22,12 +22,12 @@ struct ProfileUpdateView: View {
VStack(spacing: 26.7) {
VStack(alignment: .leading, spacing: 0) {
Text("이메일")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.grayee)
.padding(.leading, 6.7)
Text(viewModel.email)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.gray77)
.padding(.top, 12)
.padding(.leading, 6.7)
@@ -41,12 +41,12 @@ struct ProfileUpdateView: View {
HStack(alignment: .bottom, spacing: 13.3) {
VStack(alignment: .leading, spacing: 0) {
Text("비밀번호")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.grayee)
.padding(.leading, 6.7)
Text("********")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.gray77)
.padding(.top, 12)
.padding(.leading, 6.7)
@@ -81,12 +81,12 @@ struct ProfileUpdateView: View {
HStack(alignment: .bottom, spacing: 13.3) {
VStack(alignment: .leading, spacing: 0) {
Text("닉네임")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.grayee)
.padding(.leading, 6.7)
Text(viewModel.nickname)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
.padding(.top, 12)
.padding(.leading, 6.7)
@@ -122,7 +122,7 @@ struct ProfileUpdateView: View {
.frame(width: 20, height: 20)
Text("여자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
}
}
@@ -136,7 +136,7 @@ struct ProfileUpdateView: View {
.frame(width: 20, height: 20)
Text("남자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
}
}
@@ -150,7 +150,7 @@ struct ProfileUpdateView: View {
.frame(width: 20, height: 20)
Text("공개 안 함")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
}
}
@@ -235,7 +235,7 @@ struct ProfileUpdateView: View {
ForEach(viewModel.tags, id: \.self) { tag in
HStack(spacing: 6.7) {
Text(tag)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(.white)
Image("ic_circle_x")
@@ -449,7 +449,7 @@ struct ProfileUpdateView: 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)

2
SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift
View File

@@ -71,7 +71,7 @@ struct MemberTagView: View {
}
Text(tag.tag)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(
selectedTags.contains(tag.tag) ?
Color.button :

24
SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift
View File

@@ -31,7 +31,7 @@ struct LiveReservationCancelView: View {
if item.price > 0 {
Text("결제한 \(item.price)캔이\n환불처리 되었습니다.")
.font(.custom(Font.medium.rawValue, size: 20))
.appFont(size: 20, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.frame(width: screenSize().width - 26.7, alignment: .leading)
.padding(.top, 20)
@@ -39,7 +39,7 @@ struct LiveReservationCancelView: View {
HStack(spacing: 13.3) {
Text("다른 라이브 예약하기")
.font(.custom(Font.medium.rawValue, size: 15))
.appFont(size: 15, weight: .medium)
.foregroundColor(Color.button)
.padding(.vertical, 16)
.frame(width: (screenSize().width - 40) / 2)
@@ -57,7 +57,7 @@ struct LiveReservationCancelView: View {
}
Text("캔내역 확인하기")
.font(.custom(Font.medium.rawValue, size: 15))
.appFont(size: 15, weight: .medium)
.foregroundColor(.white)
.padding(.vertical, 16)
.frame(width: (screenSize().width - 40) / 2)
@@ -89,16 +89,16 @@ struct LiveReservationCancelView: View {
.parseUtcIsoDate()?
.convertDateFormat(dateFormat: "yyyy.MM.dd EEE hh:mm a") ?? item.beginDateTimeUtc
Text(beginDateText)
.font(.custom(Font.medium.rawValue, size: 9.3))
.appFont(size: 9.3, weight: .medium)
.foregroundColor(Color(hex: "ffd300"))
Text(item.masterNickname)
.font(.custom(Font.medium.rawValue, size: 11.3))
.appFont(size: 11.3, weight: .medium)
.foregroundColor(Color.graybb)
.padding(.top, 10)
Text(item.title)
.font(.custom(Font.medium.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .medium)
.foregroundColor(Color(hex: "e2e2e2"))
.lineLimit(2)
.padding(.top, 4.3)
@@ -108,7 +108,7 @@ struct LiveReservationCancelView: View {
"\(item.price)캔" :
"무료"
)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "e2e2e2").opacity(0.4))
.padding(.top, 15.3)
}
@@ -130,7 +130,7 @@ struct LiveReservationCancelView: View {
.frame(width: screenSize().width - 26.7, alignment: .leading)
Text("예약취소 이유를 선택해주세요. 서비스 개선에 중요한 자료로 활용하겠습니다.")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
.frame(width: screenSize().width - 26.7, alignment: .leading)
}
@@ -149,7 +149,7 @@ struct LiveReservationCancelView: View {
.frame(width: 20, height: 20)
Text(reason)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
if index == viewModel.cancelReasons.count - 1 {
@@ -157,7 +157,7 @@ struct LiveReservationCancelView: View {
TextField("입력해주세요", text: $viewModel.reason)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
.keyboardType(.webSearch)
@@ -181,7 +181,7 @@ struct LiveReservationCancelView: View {
.padding(.vertical, 20)
Text("취소요청시, 차감했던 캔은 환불처리 됩니다. 수다방 참여인원 제한에 따라 재예약이 불가할 수 있습니다.")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "ff5c49"))
.frame(width: screenSize().width - 53.4, alignment: .leading)
@@ -211,7 +211,7 @@ struct LiveReservationCancelView: 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)

8
SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift
View File

@@ -33,16 +33,16 @@ struct LiveReservationStatusItemView: View {
.parseUtcIsoDate()?
.convertDateFormat(dateFormat: "yyyy.MM.dd EEE hh:mm a") ?? item.beginDateTimeUtc
Text(beginDateText)
.font(.custom(Font.medium.rawValue, size: 9.3))
.appFont(size: 9.3, weight: .medium)
.foregroundColor(Color(hex: "ffd300"))
Text(item.masterNickname)
.font(.custom(Font.medium.rawValue, size: 11.3))
.appFont(size: 11.3, weight: .medium)
.foregroundColor(Color(hex: "bbbbbb"))
.padding(.top, 10)
Text(item.title)
.font(.custom(Font.medium.rawValue, size: 15.3))
.appFont(size: 15.3, weight: .medium)
.foregroundColor(Color(hex: "e2e2e2"))
.lineLimit(2)
.padding(.top, 4.3)
@@ -53,7 +53,7 @@ struct LiveReservationStatusItemView: View {
"\(item.price)캔" :
"무료"
)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color(hex: "e2e2e2").opacity(0.4))
Spacer()

4
SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusView.swift
View File

@@ -27,7 +27,7 @@ struct LiveReservationStatusView: View {
}
} else {
Text("예약한 라이브가 없습니다.")
.font(.custom(Font.medium.rawValue, size: 15))
.appFont(size: 15, weight: .medium)
.foregroundColor(Color(hex: "bbbbbb"))
.frame(maxHeight: .infinity)
}
@@ -40,7 +40,7 @@ struct LiveReservationStatusView: 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)

2
SodaLive/Sources/MyPage/ReservationStatusView.swift
View File

@@ -29,7 +29,7 @@ struct ReservationStatusView: View {
.foregroundColor(Color(hex: "3bb9f1"))
Text("\(data.liveReservationCount)")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "3bb9f1"))
}
.frame(width: width, height: 46.7)

4
SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift
View File

@@ -26,7 +26,7 @@ struct FaqView: View {
.foregroundColor(Color.button)
Text(faq.question)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
.fixedSize(horizontal: false, vertical: true)
@@ -47,7 +47,7 @@ struct FaqView: View {
.padding(.top, 13.3)
RichText(html: faq.answer)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.graybb)
}
.padding(.vertical, 20)

2
SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterCategoryItemView.swift
View File

@@ -15,7 +15,7 @@ struct ServiceCenterCategoryItemView: View {
var body: some View {
GeometryReader { proxy in
Text(category)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.white)
.frame(width: proxy.size.width, height: 46.7)
.background(isSelected ? Color.button : Color.gray22)

2
SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift
View File

@@ -78,7 +78,7 @@ struct ServiceCenterView: 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)