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

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)