커스텀 폰트 pretendard-regular, gmarket-regular를 사용하고 있던 것을 appFont 모디파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -22,14 +22,14 @@ struct LatestFinishedLiveItemView: View {
|
||||
.clipShape(Circle())
|
||||
|
||||
Text(item.nickname)
|
||||
.font(.custom(Font.preRegular.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .regular)
|
||||
.foregroundColor(.white)
|
||||
.padding(.top, 20)
|
||||
|
||||
Spacer()
|
||||
|
||||
Text(item.relativeTimeText())
|
||||
.font(.custom(Font.preRegular.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .regular)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
}
|
||||
.padding(16)
|
||||
|
||||
@@ -48,12 +48,12 @@ struct LiveNowItemView: View {
|
||||
Spacer()
|
||||
|
||||
Text(item.creatorNickname)
|
||||
.font(.custom(Font.preRegular.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .regular)
|
||||
.foregroundColor(.white)
|
||||
.padding(.horizontal, 2)
|
||||
|
||||
Text(item.title)
|
||||
.font(.custom(Font.preRegular.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .regular)
|
||||
.foregroundColor(Color(hex: "#B0BEC5"))
|
||||
.lineLimit(1)
|
||||
.truncationMode(.tail)
|
||||
@@ -70,7 +70,7 @@ struct LiveNowItemView: View {
|
||||
.frame(width: 16)
|
||||
|
||||
Text("\(item.price)")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
.padding(.vertical, 4)
|
||||
@@ -81,7 +81,7 @@ struct LiveNowItemView: View {
|
||||
.padding(.bottom, 2)
|
||||
} else {
|
||||
Text("무료")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "#263238"))
|
||||
.padding(.vertical, 4)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -28,7 +28,7 @@ struct SectionLiveNowView: View {
|
||||
|
||||
if items.count > 0 {
|
||||
Text("전체보기")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
.onTapGesture { AppState.shared.setAppStep(step: .liveNowAll(onClickParticipant: onClickParticipant)) }
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ struct SectionRecommendChannelView: View {
|
||||
.frame(width: screenSize().width * 0.18, height: screenSize().width * 0.18, alignment: .center)
|
||||
|
||||
Text("더보기")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(.white)
|
||||
.frame(width: screenSize().width * 0.18)
|
||||
.lineLimit(1)
|
||||
|
||||
@@ -37,28 +37,28 @@ struct LiveReservationItemView: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text(item.creatorNickname)
|
||||
.font(.custom(Font.preRegular.rawValue, size: 18))
|
||||
.appFont(size: 18, weight: .regular)
|
||||
.foregroundColor(.white)
|
||||
.lineLimit(1)
|
||||
.truncationMode(.tail)
|
||||
|
||||
Text(item.title)
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "B0BEC5"))
|
||||
.lineLimit(1)
|
||||
.truncationMode(.tail)
|
||||
|
||||
HStack(spacing: 4) {
|
||||
Text("\(dateDic["dayOfWeek"] ?? "")")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
|
||||
Text("|")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
|
||||
Text("\(dateDic["time"] ?? "")")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "98A2F6"))
|
||||
}
|
||||
}
|
||||
@@ -92,7 +92,7 @@ struct LiveReservationItemView: View {
|
||||
.frame(width: 12)
|
||||
|
||||
Text("\(item.price)")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .regular)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
.padding(4)
|
||||
@@ -101,7 +101,7 @@ struct LiveReservationItemView: View {
|
||||
.cornerRadius(4)
|
||||
} else {
|
||||
Text("무료")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "#263238"))
|
||||
.padding(4)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -49,28 +49,28 @@ struct MyLiveReservationItemView: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text(item.creatorNickname)
|
||||
.font(.custom(Font.preRegular.rawValue, size: 18))
|
||||
.appFont(size: 18, weight: .regular)
|
||||
.foregroundColor(.white)
|
||||
.lineLimit(1)
|
||||
.truncationMode(.tail)
|
||||
|
||||
Text(item.title)
|
||||
.font(.custom(Font.preRegular.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .regular)
|
||||
.foregroundColor(Color(hex: "B0BEC5"))
|
||||
.lineLimit(1)
|
||||
.truncationMode(.tail)
|
||||
|
||||
HStack(spacing: 0) {
|
||||
Text("\(dateDic["dayOfWeek"] ?? "")")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
|
||||
Text("|")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
|
||||
Text("\(dateDic["time"] ?? "")")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "98A2F6"))
|
||||
}
|
||||
}
|
||||
@@ -104,7 +104,7 @@ struct MyLiveReservationItemView: View {
|
||||
.frame(width: 12)
|
||||
|
||||
Text("\(item.price)")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .regular)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
.padding(4)
|
||||
@@ -113,7 +113,7 @@ struct MyLiveReservationItemView: View {
|
||||
.cornerRadius(4)
|
||||
} else {
|
||||
Text("무료")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "#263238"))
|
||||
.padding(4)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -28,7 +28,7 @@ struct SectionLiveReservationView: View {
|
||||
|
||||
if items.count > 0 {
|
||||
Text("전체보기")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .regular)
|
||||
.foregroundColor(Color(hex: "78909C"))
|
||||
.onTapGesture {
|
||||
if !token.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
||||
|
||||
Reference in New Issue
Block a user