커스텀 폰트 pretendard-bold, gmarket-bold를 사용하고 있던 것을 appFont 모디파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -26,7 +26,7 @@ struct LiveRoomDonationMessageDialog: View {
|
||||
VStack(spacing: 0) {
|
||||
HStack(spacing: 0) {
|
||||
Text("후원 히스토리")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Text("(\(viewModel.donationMessageCount))")
|
||||
|
||||
@@ -19,7 +19,7 @@ struct LiveRoomDonationRankingDialog: View {
|
||||
VStack(spacing: 0) {
|
||||
HStack(spacing: 0) {
|
||||
Text("현재 라이브 후원랭킹")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Spacer()
|
||||
|
||||
@@ -54,7 +54,7 @@ struct LiveRoomDonationRankingItemView: View {
|
||||
.frame(width: 63, height: 63)
|
||||
|
||||
Text("\(index + 1)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.padding(.leading, 20)
|
||||
.padding(.trailing, 13.3)
|
||||
|
||||
@@ -15,7 +15,7 @@ struct LiveRoomDonationRankingTotalCanView: View {
|
||||
var body: some View {
|
||||
HStack(alignment: .center, spacing: 0) {
|
||||
Text("합계")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayd2)
|
||||
|
||||
if totalSecretCan > 0 {
|
||||
|
||||
@@ -23,7 +23,7 @@ struct LiveRoomHeartRankingDialog: View {
|
||||
VStack(spacing: 0) {
|
||||
HStack(spacing: 0) {
|
||||
Text("현재 라이브 하트랭킹")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Spacer()
|
||||
@@ -35,7 +35,7 @@ struct LiveRoomHeartRankingDialog: View {
|
||||
if let heartStatus = heartStatus {
|
||||
HStack(alignment: .center, spacing: 0) {
|
||||
Text("합계")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayd2)
|
||||
|
||||
Spacer()
|
||||
|
||||
@@ -54,7 +54,7 @@ struct LiveRoomHeartRankingItemView: View {
|
||||
.frame(width: 63, height: 63)
|
||||
|
||||
Text("\(index + 1)")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.padding(.leading, 20)
|
||||
.padding(.trailing, 13.3)
|
||||
|
||||
@@ -63,7 +63,7 @@ struct LiveRoomInfoEditDialog: View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
HStack(spacing: 0) {
|
||||
Text("라이브 수정")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Spacer()
|
||||
@@ -132,7 +132,7 @@ struct LiveRoomInfoEditDialog: View {
|
||||
if UserDefaults.bool(forKey: .auth) {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("연령제한")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
HStack(spacing: 0) {
|
||||
@@ -164,7 +164,7 @@ struct LiveRoomInfoEditDialog: View {
|
||||
|
||||
HStack(spacing: 0) {
|
||||
Text("입장메시지")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Spacer()
|
||||
@@ -180,7 +180,7 @@ struct LiveRoomInfoEditDialog: View {
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
Text("취소")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: (screenSize().width - 40) / 2)
|
||||
@@ -196,7 +196,7 @@ struct LiveRoomInfoEditDialog: 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)
|
||||
@@ -252,7 +252,7 @@ struct LiveRoomInfoEditDialog: View {
|
||||
func TitleInputView() -> some View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
Text("제목")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
TextField("라이브 제목을 입력하세요", text: $title)
|
||||
@@ -277,7 +277,7 @@ struct LiveRoomInfoEditDialog: View {
|
||||
VStack(spacing: 13.3) {
|
||||
HStack(spacing: 0) {
|
||||
Text("공지")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Spacer()
|
||||
|
||||
@@ -23,7 +23,7 @@ struct LiveRoomNoChattingDialogView: View {
|
||||
|
||||
VStack(spacing: 21) {
|
||||
Text("채팅금지")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "bbbbbb"))
|
||||
|
||||
HStack(spacing: 8) {
|
||||
@@ -49,7 +49,7 @@ struct LiveRoomNoChattingDialogView: View {
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
Text("취소")
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.appFont(size: 15.3, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: (screenSize().width - 80) / 2)
|
||||
@@ -62,7 +62,7 @@ struct LiveRoomNoChattingDialogView: View {
|
||||
.onTapGesture { cancelAction() }
|
||||
|
||||
Text("확인")
|
||||
.font(.custom(Font.bold.rawValue, size: 15.3))
|
||||
.appFont(size: 15.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "ffffff"))
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: (screenSize().width - 80) / 2)
|
||||
|
||||
@@ -43,7 +43,7 @@ struct LiveRoomProfileDialog: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
Text(profileInfo.nickname)
|
||||
.font(.custom(Font.bold.rawValue, size: 20))
|
||||
.appFont(size: 20, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.padding(.top, 6.7)
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ struct LiveRoomProfileItemTitleView: View {
|
||||
var body: some View {
|
||||
HStack(spacing: 0) {
|
||||
Text(title)
|
||||
.font(.custom(Font.bold.rawValue, size: 13))
|
||||
.appFont(size: 13, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
if let count = count {
|
||||
@@ -207,7 +207,7 @@ struct LiveRoomProfileRequestSpeakerView: View {
|
||||
Spacer()
|
||||
Image("ic_request_speak")
|
||||
Text("스피커 요청하기")
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
Spacer()
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ struct LiveRoomProfilesDialogView: View {
|
||||
VStack(spacing: 16.7) {
|
||||
HStack(spacing: 0) {
|
||||
Text("참여자")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Text("\(roomInfo.participantsCount)")
|
||||
|
||||
@@ -30,7 +30,7 @@ struct LiveRoomUserProfileDialogView: View {
|
||||
VStack(spacing: 0) {
|
||||
HStack(spacing: 0) {
|
||||
Text("프로필")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Spacer()
|
||||
@@ -45,7 +45,7 @@ struct LiveRoomUserProfileDialogView: View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
HStack(spacing: 8) {
|
||||
Text(userProfile.nickname)
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Text(userProfile.gender)
|
||||
@@ -92,7 +92,7 @@ struct LiveRoomUserProfileDialogView: View {
|
||||
HStack(spacing: 8) {
|
||||
if let isSpeaker = userProfile.isSpeaker {
|
||||
Text(isSpeaker ? "리스너 변경" : "스피커 초대")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 13)
|
||||
@@ -115,7 +115,7 @@ struct LiveRoomUserProfileDialogView: View {
|
||||
|
||||
if let isManager = userProfile.isManager {
|
||||
Text(isManager ? "스탭 해제" : "스탭 지정")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 13)
|
||||
@@ -139,7 +139,7 @@ struct LiveRoomUserProfileDialogView: View {
|
||||
if (userProfile.isSpeaker != nil && !viewModel.isEqualToStaffId(creatorId: userProfile.userId)) ||
|
||||
(userProfile.isSpeaker != nil && userProfile.isManager != nil) {
|
||||
Text("내보내기")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 13)
|
||||
@@ -160,7 +160,7 @@ struct LiveRoomUserProfileDialogView: View {
|
||||
|
||||
if let _ = userProfile.isManager {
|
||||
Text("3분간 채팅금지")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.appFont(size: 15, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.vertical, 13)
|
||||
|
||||
Reference in New Issue
Block a user