커스텀 폰트 pretendard-bold, gmarket-bold를 사용하고 있던 것을 appFont 모디파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -24,7 +24,7 @@ struct WeekCalendarView: View {
|
||||
)
|
||||
|
||||
Text(dateWithWeekDaySymbol.dayOfMonth)
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.appFont(size: 15.3, weight: .bold)
|
||||
.foregroundColor(
|
||||
self.selectedIndex == index ?
|
||||
.white :
|
||||
|
||||
@@ -21,7 +21,7 @@ struct LiveReservationCompleteView: View {
|
||||
ScrollView(.vertical, showsIndicators: false) {
|
||||
VStack(spacing: 0) {
|
||||
Text("예약이 완료되었습니다.")
|
||||
.font(.custom(Font.bold.rawValue, size: 20))
|
||||
.appFont(size: 20, weight: .bold)
|
||||
.foregroundColor(Color(hex: "a285eb"))
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
.padding(.top, 20)
|
||||
@@ -34,7 +34,7 @@ struct LiveReservationCompleteView: View {
|
||||
.padding(.bottom, 26.7)
|
||||
|
||||
Text("라이브 예약정보")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.frame(width: screenSize().width - 53.4, alignment: .leading)
|
||||
|
||||
@@ -95,7 +95,7 @@ struct LiveReservationCompleteView: View {
|
||||
.padding(.vertical, 20)
|
||||
|
||||
Text("결제정보")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.frame(width: screenSize().width - 53.4, alignment: .leading)
|
||||
|
||||
@@ -108,7 +108,7 @@ struct LiveReservationCompleteView: View {
|
||||
Spacer()
|
||||
|
||||
Text("\(reservationCompleteData.haveCan)")
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.appFont(size: 15.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(" 캔")
|
||||
@@ -125,7 +125,7 @@ struct LiveReservationCompleteView: View {
|
||||
Spacer()
|
||||
|
||||
Text("\(reservationCompleteData.useCan)")
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.appFont(size: 15.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(" 캔")
|
||||
@@ -142,7 +142,7 @@ struct LiveReservationCompleteView: View {
|
||||
Spacer()
|
||||
|
||||
Text("\(reservationCompleteData.remainingCan)")
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.appFont(size: 15.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text(" 캔")
|
||||
@@ -155,7 +155,7 @@ struct LiveReservationCompleteView: View {
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
Text("홈으로 이동")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "9970ff"))
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: (screenSize().width - 40) / 2)
|
||||
@@ -171,7 +171,7 @@ struct LiveReservationCompleteView: View {
|
||||
}
|
||||
|
||||
Text("예약 내역 이동")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: (screenSize().width - 40) / 2)
|
||||
|
||||
@@ -68,7 +68,7 @@ struct LiveReservationItemView: View {
|
||||
VStack(alignment: .trailing, spacing: 8) {
|
||||
VStack(spacing: 0) {
|
||||
Text("\(dateDic["month"] ?? "")월")
|
||||
.font(.custom(Font.preBold.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 6)
|
||||
.frame(maxWidth: .infinity)
|
||||
@@ -76,7 +76,7 @@ struct LiveReservationItemView: View {
|
||||
.cornerRadius(16, corners: [.topLeft, .topRight])
|
||||
|
||||
Text("\(dateDic["day"] ?? "")")
|
||||
.font(.custom(Font.preBold.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .bold)
|
||||
.foregroundColor(Color(hex: "263238"))
|
||||
.padding(.vertical, 6)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -22,7 +22,7 @@ struct MyLiveReservationItemView: View {
|
||||
Image("ic_mic_colored")
|
||||
|
||||
Text("내가 개설한 라이브")
|
||||
.font(.custom(Font.preBold.rawValue, size: 18))
|
||||
.appFont(size: 18, weight: .bold)
|
||||
.foregroundColor(Color(hex: "80D8FF"))
|
||||
}
|
||||
}
|
||||
@@ -80,7 +80,7 @@ struct MyLiveReservationItemView: View {
|
||||
VStack(alignment: .trailing, spacing: 8) {
|
||||
VStack(spacing: 4) {
|
||||
Text("\(dateDic["month"] ?? "")월")
|
||||
.font(.custom(Font.preBold.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 6)
|
||||
.frame(maxWidth: .infinity)
|
||||
@@ -88,7 +88,7 @@ struct MyLiveReservationItemView: View {
|
||||
.cornerRadius(16, corners: [.topLeft, .topRight])
|
||||
|
||||
Text("\(dateDic["day"] ?? "")")
|
||||
.font(.custom(Font.preBold.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .bold)
|
||||
.foregroundColor(Color(hex: "263238"))
|
||||
.padding(.vertical, 6)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -21,7 +21,7 @@ struct SectionLiveReservationView: View {
|
||||
VStack(spacing: 13.3) {
|
||||
HStack(spacing: 0) {
|
||||
Text("라이브 예약중")
|
||||
.font(.custom(Font.preBold.rawValue, size: 24))
|
||||
.appFont(size: 24, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Spacer()
|
||||
|
||||
Reference in New Issue
Block a user