커스텀 폰트 pretendard-bold, gmarket-bold를 사용하고 있던 것을 appFont 모디파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -20,7 +20,7 @@ struct AudioContentDeleteDialogView: View {
|
||||
var body: some View {
|
||||
VStack(spacing: 0) {
|
||||
Text("콘텐츠 삭제")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text("[\(title)]을 삭제하시겠습니까?")
|
||||
@@ -57,7 +57,7 @@ struct AudioContentDeleteDialogView: View {
|
||||
|
||||
HStack(spacing: 12) {
|
||||
Text("취소")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "9970ff"))
|
||||
.padding(.horizontal, 55)
|
||||
.padding(.vertical, 16)
|
||||
@@ -71,7 +71,7 @@ struct AudioContentDeleteDialogView: View {
|
||||
}
|
||||
|
||||
Text("확인")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.padding(.horizontal, 55)
|
||||
.padding(.vertical, 16)
|
||||
|
||||
@@ -32,7 +32,7 @@ struct AudioContentReportDialogView: View {
|
||||
|
||||
VStack(spacing: 13.3) {
|
||||
Text("콘텐츠 신고")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
VStack(spacing: 13.3) {
|
||||
@@ -66,7 +66,7 @@ struct AudioContentReportDialogView: View {
|
||||
|
||||
HStack(spacing: 12) {
|
||||
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 - 100) / 2)
|
||||
@@ -80,7 +80,7 @@ struct AudioContentReportDialogView: View {
|
||||
}
|
||||
|
||||
Text("신고")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: (screenSize().width - 100) / 2)
|
||||
|
||||
@@ -82,7 +82,7 @@ struct AudioContentCommentItemView: View {
|
||||
.frame(width: 13.3, height: 13.3)
|
||||
|
||||
Text("\(commentItem.donationCan)")
|
||||
.font(.custom(Font.bold.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
.padding(.horizontal, 6.7)
|
||||
|
||||
@@ -26,12 +26,12 @@ struct ContentDetailInfoLimitedEditionView: View {
|
||||
|
||||
if let orderSequence = orderSequence {
|
||||
Text("\(orderSequence)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.padding(.leading, 5.3)
|
||||
|
||||
Text("/")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayd2)
|
||||
.padding(.leading, 2.3)
|
||||
|
||||
@@ -56,7 +56,7 @@ struct ContentDetailInfoLimitedEditionView: View {
|
||||
.foregroundColor(Color.grayd2)
|
||||
|
||||
Text("\(remainingContentCount)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.padding(.leading, 5.3)
|
||||
}
|
||||
@@ -70,7 +70,7 @@ struct ContentDetailInfoLimitedEditionView: View {
|
||||
|
||||
if !buyerList.isEmpty {
|
||||
Text("구매자")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
ScrollView(.horizontal, showsIndicators: false) {
|
||||
|
||||
@@ -81,7 +81,7 @@ struct ContentDetailInfoView: View {
|
||||
}
|
||||
|
||||
Text(audioContent.translated?.title ?? audioContent.title)
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayd2)
|
||||
.lineSpacing(5)
|
||||
.multilineTextAlignment(.leading)
|
||||
|
||||
@@ -16,7 +16,7 @@ struct ContentDetailOtherContentView: View {
|
||||
var body: some View {
|
||||
VStack(spacing: 21.3) {
|
||||
Text(title)
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ struct ContentDetailPlayView: View {
|
||||
|
||||
if let _ = audioContent.totalContentCount, let remainingContentCount = audioContent.remainingContentCount, remainingContentCount <= 0, audioContent.creator.creatorId != UserDefaults.int(forKey: .userId), !audioContent.existOrdered {
|
||||
Text("Sold Out")
|
||||
.font(.custom(Font.bold.rawValue, size: 36.7))
|
||||
.appFont(size: 36.7, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.frame(
|
||||
width: screenSize().width - 26.7,
|
||||
|
||||
@@ -22,7 +22,7 @@ struct ContentDetailPurchaseButton: View {
|
||||
}
|
||||
|
||||
Text(UserDefaults.int(forKey: .userId) == 17958 ? "\(price * 110)" : "\(price)")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.leading, 5.3)
|
||||
|
||||
@@ -31,7 +31,7 @@ struct ContentDetailPurchaseButton: View {
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text(title)
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -39,7 +39,7 @@ struct ContentDetailView: View {
|
||||
.frame(width: 20, height: 20)
|
||||
|
||||
Text("콘텐츠 상세")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ struct ContentDetailView: View {
|
||||
|
||||
if let releaseDate = audioContent.releaseDate {
|
||||
Text(releaseDate)
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(height: 48.7)
|
||||
@@ -123,7 +123,7 @@ struct ContentDetailView: View {
|
||||
audioContent.creator.creatorId != UserDefaults.int(forKey: .userId) {
|
||||
if let _ = audioContent.totalContentCount, let remainingContentCount = audioContent.remainingContentCount, remainingContentCount <= 0 {
|
||||
Text("해당 콘텐츠가 매진되었습니다.")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(height: 48.7)
|
||||
|
||||
@@ -36,7 +36,7 @@ struct ContentOrderConfirmDialogView: View {
|
||||
|
||||
VStack(spacing: 0) {
|
||||
Text("구매확인")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
HStack(spacing: 11) {
|
||||
@@ -64,7 +64,7 @@ struct ContentOrderConfirmDialogView: View {
|
||||
.cornerRadius(2)
|
||||
|
||||
Text(title)
|
||||
.font(.custom(Font.bold.rawValue, size: 11.3))
|
||||
.appFont(size: 11.3, weight: .bold)
|
||||
.foregroundColor(Color.grayd2)
|
||||
.padding(.top, 2)
|
||||
|
||||
@@ -127,7 +127,7 @@ struct ContentOrderConfirmDialogView: View {
|
||||
.frame(width: 16.7, height: 16.7)
|
||||
|
||||
Text("\(usablePoint)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
}
|
||||
@@ -145,13 +145,13 @@ struct ContentOrderConfirmDialogView: View {
|
||||
.frame(width: 16.7, height: 16.7)
|
||||
|
||||
Text("\(remainingCan)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Text("\(price * 110)원")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@ struct ContentOrderConfirmDialogView: View {
|
||||
|
||||
HStack(spacing: 12) {
|
||||
Text("취소")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.padding(.vertical, 15.7)
|
||||
.frame(maxWidth: .infinity)
|
||||
@@ -182,7 +182,7 @@ struct ContentOrderConfirmDialogView: View {
|
||||
.onTapGesture { isShowing = false }
|
||||
|
||||
Text("확인")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 15.7)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -28,7 +28,7 @@ struct ContentOrderDialogView: View {
|
||||
HStack(spacing: 0) {
|
||||
VStack(alignment: .leading, spacing: 5.3) {
|
||||
Text("대여")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text("(이용기간 5일)")
|
||||
@@ -47,17 +47,17 @@ struct ContentOrderDialogView: View {
|
||||
|
||||
if UserDefaults.int(forKey: .userId) == 17958 {
|
||||
Text("\(Int(ceil(Double(price) * 0.7)) * 110)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
} else {
|
||||
Text("\(Int(ceil(Double(price) * 0.7)))")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
|
||||
if UserDefaults.int(forKey: .userId) == 17958 {
|
||||
Text("원")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
}
|
||||
@@ -74,7 +74,7 @@ struct ContentOrderDialogView: View {
|
||||
HStack(spacing: 0) {
|
||||
VStack(alignment: .leading, spacing: 5.3) {
|
||||
Text("소장")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text("(서비스 종료시까지)")
|
||||
@@ -93,17 +93,17 @@ struct ContentOrderDialogView: View {
|
||||
|
||||
if UserDefaults.int(forKey: .userId) == 17958 {
|
||||
Text("\(price * 110)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
} else {
|
||||
Text("\(price)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
|
||||
if UserDefaults.int(forKey: .userId) == 17958 {
|
||||
Text("원")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ struct LiveRoomDonationDialogView: 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.grayee)
|
||||
|
||||
Spacer()
|
||||
@@ -55,7 +55,7 @@ struct LiveRoomDonationDialogView: View {
|
||||
.frame(width: 26.7, height: 26.7)
|
||||
|
||||
Text("\(can)")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Text("충전")
|
||||
@@ -116,7 +116,7 @@ struct LiveRoomDonationDialogView: View {
|
||||
|
||||
HStack(spacing: 0) {
|
||||
Text("+10")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 12.7)
|
||||
.frame(width: 74)
|
||||
@@ -134,7 +134,7 @@ struct LiveRoomDonationDialogView: View {
|
||||
Spacer()
|
||||
|
||||
Text("+100")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 12.7)
|
||||
.frame(width: 74)
|
||||
@@ -150,7 +150,7 @@ struct LiveRoomDonationDialogView: View {
|
||||
Spacer()
|
||||
|
||||
Text("+1,000")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 12.7)
|
||||
.frame(width: 74)
|
||||
@@ -168,7 +168,7 @@ struct LiveRoomDonationDialogView: View {
|
||||
Spacer()
|
||||
|
||||
Text("+10,000")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 12.7)
|
||||
.frame(width: 74)
|
||||
@@ -218,7 +218,7 @@ struct LiveRoomDonationDialogView: View {
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
Text("취소")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: (screenSize().width - 53.3) / 3)
|
||||
@@ -234,7 +234,7 @@ struct LiveRoomDonationDialogView: View {
|
||||
}
|
||||
|
||||
Text("후원하기")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: (screenSize().width - 53.3) * 2 / 3)
|
||||
|
||||
Reference in New Issue
Block a user