커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -78,7 +78,7 @@ struct LiveDetailView: View {
|
||||
HStack(spacing: 5.3) {
|
||||
if room.isAdult {
|
||||
Text("19")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color(hex: "e33621"))
|
||||
.padding(.horizontal, 5.3)
|
||||
.padding(.vertical, 3.3)
|
||||
@@ -96,7 +96,7 @@ struct LiveDetailView: View {
|
||||
HStack(spacing: 0) {
|
||||
let beginDateText = room.beginDateTimeUtc.parseUtcIsoDate()?.localizedDateTimeString() ?? room.beginDateTimeUtc
|
||||
Text(beginDateText)
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
|
||||
Spacer()
|
||||
@@ -155,7 +155,7 @@ struct LiveDetailView: View {
|
||||
VStack(spacing: 16.7) {
|
||||
HStack(spacing: 6.7) {
|
||||
Text(manager.nickname)
|
||||
.font(.custom(Font.medium.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .medium)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Spacer()
|
||||
@@ -199,7 +199,7 @@ struct LiveDetailView: View {
|
||||
|
||||
HStack(alignment: .center, spacing: 0) {
|
||||
Text(manager.introduce)
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color(hex: "777777"))
|
||||
.lineLimit(3)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
@@ -213,7 +213,7 @@ struct LiveDetailView: View {
|
||||
.frame(width: 13.3, height: 13.3)
|
||||
|
||||
Text("채널보기")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.white)
|
||||
.onTapGesture {
|
||||
AppState.shared.setAppStep(step: .creatorDetail(userId: manager.id))
|
||||
@@ -240,13 +240,13 @@ struct LiveDetailView: View {
|
||||
.foregroundColor(Color(hex: "909090").opacity(0.5))
|
||||
|
||||
Text(room.tags.map { "#\($0)" }.joined(separator: " "))
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "3bb9f1"))
|
||||
.frame(width: proxy.size.width - 26, alignment: .leading)
|
||||
.padding(.top, 26.7)
|
||||
|
||||
Text(room.notice)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color(hex: "777777"))
|
||||
.frame(width: proxy.size.width - 26, alignment: .leading)
|
||||
.padding(.top, 26.7)
|
||||
@@ -291,7 +291,7 @@ struct LiveDetailView: 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(hex: "3bb9f1"))
|
||||
.foregroundColor(Color.white)
|
||||
.multilineTextAlignment(.center)
|
||||
@@ -354,7 +354,7 @@ struct LiveDetailView: View {
|
||||
}
|
||||
|
||||
Text("예약삭제")
|
||||
.font(.custom(Font.medium.rawValue, size: 14))
|
||||
.appFont(size: 14, weight: .medium)
|
||||
.foregroundColor(Color(hex: "ff5c49"))
|
||||
.padding(5.3)
|
||||
.cornerRadius(10)
|
||||
@@ -416,17 +416,17 @@ struct LiveDetailView: View {
|
||||
if isExpandParticipantArea {
|
||||
HStack(spacing: 0) {
|
||||
Text(room.channelName.isNullOrBlank() ? "예약자" : "참가자")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.graybb)
|
||||
|
||||
Spacer()
|
||||
|
||||
Text("\(room.numberOfParticipants)")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.button)
|
||||
|
||||
Text("/\(room.numberOfParticipantsTotal)")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.graybb)
|
||||
}
|
||||
.padding(.top, 16.7)
|
||||
@@ -448,7 +448,7 @@ struct LiveDetailView: View {
|
||||
.clipShape(Circle())
|
||||
|
||||
Text(user.nickname)
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.graybb)
|
||||
.lineLimit(1)
|
||||
}
|
||||
@@ -479,11 +479,11 @@ struct LiveDetailView: View {
|
||||
|
||||
HStack(spacing: 0) {
|
||||
Text("\(room.numberOfParticipants)")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.button)
|
||||
|
||||
Text("/\(room.numberOfParticipantsTotal)")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.graybb)
|
||||
}
|
||||
}
|
||||
@@ -497,7 +497,7 @@ struct LiveDetailView: View {
|
||||
.frame(width: 20, height: 20)
|
||||
|
||||
Text(isExpandParticipantArea ? "닫기" : "펼쳐보기")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.graybb)
|
||||
}
|
||||
.padding(.top, 13.3)
|
||||
|
||||
Reference in New Issue
Block a user