커스텀 폰트 pretendard-bold, gmarket-bold를 사용하고 있던 것을 appFont 모디파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -20,7 +20,7 @@ struct LiveCancelDialog: 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: "bbbbbb"))
|
||||
.padding(.top, 40)
|
||||
|
||||
@@ -40,7 +40,7 @@ struct LiveCancelDialog: View {
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
Text("취소")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "3bb9f1"))
|
||||
.padding(.vertical, 16)
|
||||
.padding(.horizontal, 48)
|
||||
@@ -55,7 +55,7 @@ struct LiveCancelDialog: View {
|
||||
}
|
||||
|
||||
Text("확인")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 16)
|
||||
.padding(.horizontal, 48)
|
||||
|
||||
@@ -20,7 +20,7 @@ struct LiveReplayListView: View {
|
||||
VStack(spacing: 14) {
|
||||
HStack(spacing: 0) {
|
||||
Text("라이브 다시 듣기")
|
||||
.font(.custom(Font.preBold.rawValue, size: 24))
|
||||
.appFont(size: 24, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Spacer()
|
||||
|
||||
@@ -133,7 +133,7 @@ struct LiveView: View {
|
||||
.frame(width: 20, height: 20)
|
||||
|
||||
Text("라이브 만들기")
|
||||
.font(.custom(Font.preBold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
.padding(13.3)
|
||||
|
||||
@@ -21,7 +21,7 @@ struct SectionLiveNowView: View {
|
||||
LazyVStack(spacing: 13.3) {
|
||||
HStack(spacing: 0) {
|
||||
Text("지금 라이브중")
|
||||
.font(.custom(Font.preBold.rawValue, size: 24))
|
||||
.appFont(size: 24, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Spacer()
|
||||
|
||||
@@ -18,7 +18,7 @@ struct SectionRecommendChannelView: View {
|
||||
VStack(spacing: 16) {
|
||||
HStack(spacing: 0) {
|
||||
Text("팔로잉 채널")
|
||||
.font(.custom(Font.preBold.rawValue, size: 24))
|
||||
.appFont(size: 24, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Spacer()
|
||||
@@ -56,7 +56,7 @@ struct SectionRecommendChannelView: View {
|
||||
|
||||
if item.isOnAir {
|
||||
Text("Live")
|
||||
.font(.custom(Font.bold.rawValue, size: 8.7))
|
||||
.appFont(size: 8.7, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 2.7)
|
||||
.padding(.horizontal, 5.7)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -40,7 +40,7 @@ struct LiveRoomCreateView: View {
|
||||
.frame(width: 20, height: 20)
|
||||
|
||||
Text("라이브 만들기")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ struct LiveRoomCreateView: View {
|
||||
VStack(spacing: 0) {
|
||||
VStack(spacing: 0) {
|
||||
Text("썸네일")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.padding(.horizontal, 13.3)
|
||||
.padding(.top, 13.3)
|
||||
@@ -156,7 +156,7 @@ struct LiveRoomCreateView: View {
|
||||
|
||||
VStack(spacing: 13.3) {
|
||||
Text("크리에이터 입장 설정")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
@@ -193,7 +193,7 @@ struct LiveRoomCreateView: View {
|
||||
}
|
||||
}) {
|
||||
Text("라이브 오픈하기")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.white)
|
||||
.frame(width: screenSize().width - 26.7, height: 50)
|
||||
.background(Color.button)
|
||||
@@ -282,7 +282,7 @@ struct LiveRoomCreateView: View {
|
||||
func TitleInputView() -> some View {
|
||||
VStack(spacing: 0) {
|
||||
Text("제목")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.padding(.horizontal, 13.3)
|
||||
.frame(width: screenSize().width, alignment: .leading)
|
||||
@@ -308,7 +308,7 @@ struct LiveRoomCreateView: View {
|
||||
func TagSelectView() -> some View {
|
||||
VStack(alignment: .leading, spacing: 13.3) {
|
||||
Text("관심사")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Button(action: {
|
||||
@@ -316,7 +316,7 @@ struct LiveRoomCreateView: View {
|
||||
isShowSelectTagView = true
|
||||
}) {
|
||||
Text("관심사 선택")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.padding(.vertical, 13.7)
|
||||
.frame(width: screenSize().width - 26.7)
|
||||
@@ -359,7 +359,7 @@ struct LiveRoomCreateView: 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()
|
||||
@@ -388,7 +388,7 @@ struct LiveRoomCreateView: View {
|
||||
func TimeSettingView() -> some View {
|
||||
VStack(spacing: 0) {
|
||||
Text("시간설정")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
@@ -426,7 +426,7 @@ struct LiveRoomCreateView: View {
|
||||
}
|
||||
|
||||
Text(title)
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(
|
||||
viewModel.timeSettingMode == timeSettingMode ?
|
||||
.white :
|
||||
@@ -496,7 +496,7 @@ struct LiveRoomCreateView: View {
|
||||
func NumberOfPeopleLimitView() -> some View {
|
||||
VStack(spacing: 13.3) {
|
||||
Text("참여인원 설정")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
@@ -581,7 +581,7 @@ struct LiveRoomCreateView: View {
|
||||
func RoomTypeSettingView() -> some View {
|
||||
VStack(spacing: 0) {
|
||||
Text("공개 설정")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
@@ -616,7 +616,7 @@ struct LiveRoomCreateView: View {
|
||||
}
|
||||
|
||||
Text(title)
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(viewModel.roomType == type ? .white : Color.button)
|
||||
}
|
||||
.frame(width: buttonWidth, height: 48.7)
|
||||
@@ -634,7 +634,7 @@ struct LiveRoomCreateView: View {
|
||||
func RoomPasswordView() -> some View {
|
||||
VStack(spacing: 13.3) {
|
||||
Text("방 비밀번호 입력")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
@@ -657,7 +657,7 @@ struct LiveRoomCreateView: View {
|
||||
func AdultSettingView() -> some View {
|
||||
VStack(spacing: 13.3) {
|
||||
Text("연령 제한")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
@@ -685,7 +685,7 @@ struct LiveRoomCreateView: View {
|
||||
}
|
||||
|
||||
Text(title)
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(viewModel.isAdult == isAdult ? .white : Color.button)
|
||||
}
|
||||
.frame(width: buttonWidth, height: 48.7)
|
||||
@@ -703,7 +703,7 @@ struct LiveRoomCreateView: View {
|
||||
func PriceSettingView() -> some View {
|
||||
VStack(spacing: 13.3) {
|
||||
Text("티켓 가격")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
@@ -728,7 +728,7 @@ struct LiveRoomCreateView: View {
|
||||
.autocapitalization(.none)
|
||||
.disableAutocorrection(true)
|
||||
.multilineTextAlignment(.center)
|
||||
.font(.custom(Font.bold.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .bold)
|
||||
.foregroundColor(Color.button)
|
||||
.accentColor(Color.button)
|
||||
.keyboardType(.numberPad)
|
||||
|
||||
@@ -30,7 +30,7 @@ struct LiveRoomCreateTagView: View {
|
||||
HStack(alignment: .top, spacing: 0) {
|
||||
VStack(alignment: .leading, spacing: 6.7) {
|
||||
Text("관심사 선택")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text("최대 3개까지 선택 가능합니다.")
|
||||
@@ -101,7 +101,7 @@ struct LiveRoomCreateTagView: View {
|
||||
.padding(.top, 26.7)
|
||||
|
||||
Text("확인")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 16)
|
||||
.frame(width: screenSize().width - 26.7)
|
||||
|
||||
@@ -87,7 +87,7 @@ struct LiveDetailView: View {
|
||||
}
|
||||
|
||||
Text(room.title)
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
}
|
||||
.frame(width: proxy.size.width - 26.7, alignment: .leading)
|
||||
@@ -103,7 +103,7 @@ struct LiveDetailView: View {
|
||||
|
||||
if room.price > 0 {
|
||||
Text("\(room.price)")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
Image("ic_can")
|
||||
@@ -112,7 +112,7 @@ struct LiveDetailView: View {
|
||||
.padding(.leading, 6.7)
|
||||
} else {
|
||||
Text("무료")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
}
|
||||
}
|
||||
@@ -325,7 +325,7 @@ struct LiveDetailView: View {
|
||||
VStack(spacing: 16.7) {
|
||||
HStack(spacing: 13.3) {
|
||||
Text("수정")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.white)
|
||||
.padding(.vertical, 16)
|
||||
.padding(.horizontal, 27)
|
||||
@@ -341,7 +341,7 @@ struct LiveDetailView: View {
|
||||
}
|
||||
|
||||
Text("라이브 시작")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.white)
|
||||
.padding(.vertical, 16)
|
||||
.frame(maxWidth: .infinity)
|
||||
@@ -370,7 +370,7 @@ struct LiveDetailView: View {
|
||||
.frame(width: screenSize().width - 26.7)
|
||||
} else if room.isPaid {
|
||||
Text("예약완료")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color(hex: "777777"))
|
||||
.padding(.vertical, 16)
|
||||
.padding(.horizontal, 99)
|
||||
@@ -383,7 +383,7 @@ struct LiveDetailView: View {
|
||||
AppState.shared.back()
|
||||
} label: {
|
||||
Text("예약하기")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.white)
|
||||
.padding(.vertical, 16)
|
||||
.padding(.horizontal, 99)
|
||||
@@ -398,7 +398,7 @@ struct LiveDetailView: View {
|
||||
AppState.shared.back()
|
||||
} label: {
|
||||
Text("지금 참여하기")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.white)
|
||||
.padding(.vertical, 16)
|
||||
.padding(.horizontal, 79)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -48,7 +48,7 @@ struct LiveRoomEditView: View {
|
||||
|
||||
if !viewModel.isLoading {
|
||||
Text("라이브 수정")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.white)
|
||||
.frame(width: screenSize().width - 26.7, height: 50)
|
||||
.background(Color(hex: "9970ff"))
|
||||
@@ -105,7 +105,7 @@ struct LiveRoomEditView: View {
|
||||
func TitleInputView() -> some View {
|
||||
VStack(spacing: 0) {
|
||||
Text("제목")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.padding(.horizontal, 13.3)
|
||||
.frame(width: screenSize().width, alignment: .leading)
|
||||
@@ -132,7 +132,7 @@ struct LiveRoomEditView: 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(hex: "eeeeee"))
|
||||
|
||||
Spacer()
|
||||
@@ -209,7 +209,7 @@ struct LiveRoomEditView: View {
|
||||
func NumberOfPeopleLimitView() -> some View {
|
||||
VStack(spacing: 13.3) {
|
||||
Text("참여인원 설정")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ struct LiveRoomMenuSelectView: View {
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
Text("메뉴")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
|
||||
HStack(spacing: 0) {
|
||||
|
||||
@@ -61,7 +61,7 @@ struct MenuSettingsView: View {
|
||||
.padding(.horizontal, 13.3)
|
||||
|
||||
Text("저장하기")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 16)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -66,7 +66,7 @@ struct RouletteSettingsView: View {
|
||||
if availableActive {
|
||||
HStack(spacing: 0) {
|
||||
Text("룰렛을 활성화 하시겠습니까?")
|
||||
.font(.custom(Font.bold.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Spacer()
|
||||
@@ -83,7 +83,7 @@ struct RouletteSettingsView: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 13.3) {
|
||||
Text("룰렛 금액 설정")
|
||||
.font(.custom(Font.bold.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
HStack(spacing: 8) {
|
||||
@@ -109,7 +109,7 @@ struct RouletteSettingsView: View {
|
||||
Spacer()
|
||||
|
||||
Text("캔")
|
||||
.font(.custom(Font.bold.rawValue, size: 16.7))
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
}
|
||||
}
|
||||
@@ -117,7 +117,7 @@ struct RouletteSettingsView: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 21.3) {
|
||||
Text("룰렛 옵션 설정")
|
||||
.font(.custom(Font.bold.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
HStack(spacing: 0) {
|
||||
@@ -166,7 +166,7 @@ struct RouletteSettingsView: 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(maxWidth: .infinity)
|
||||
@@ -180,7 +180,7 @@ struct RouletteSettingsView: View {
|
||||
}
|
||||
|
||||
Text("설정완료")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 16)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -69,7 +69,7 @@ struct RoulettePreviewDialog: View {
|
||||
|
||||
HStack(spacing: 0) {
|
||||
Text(title ?? "룰렛")
|
||||
.font(.custom(Font.bold.rawValue, size: 18.3))
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Spacer()
|
||||
@@ -78,7 +78,7 @@ struct RoulettePreviewDialog: View {
|
||||
HStack(spacing: 6.7) {
|
||||
Image("ic_can")
|
||||
Text("\(UserDefaults.int(forKey: .can))")
|
||||
.font(.custom(Font.bold.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
Image("ic_forward")
|
||||
}
|
||||
@@ -97,7 +97,7 @@ struct RoulettePreviewDialog: View {
|
||||
ForEach(previewList[selectedRoulette.rawValue].items.indices, id: \.self) { index in
|
||||
HStack(spacing:13.3) {
|
||||
Text("\(index + 1)")
|
||||
.font(.custom(Font.bold.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .bold)
|
||||
.foregroundColor(Color(hex: "e2e2e2"))
|
||||
|
||||
Text("\(previewList[selectedRoulette.rawValue].items[index].title) (\(previewList[selectedRoulette.rawValue].items[index].percent))")
|
||||
@@ -110,7 +110,7 @@ struct RoulettePreviewDialog: View {
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
Text("취소")
|
||||
.font(.custom(Font.bold.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .bold)
|
||||
.foregroundColor(
|
||||
selectedRoulette == .ROULETTE_2 ? Color(hex: "ffcb14") :
|
||||
selectedRoulette == .ROULETTE_3 ? Color(hex: "ff14d9") :
|
||||
@@ -132,7 +132,7 @@ struct RoulettePreviewDialog: View {
|
||||
}
|
||||
|
||||
Text("\(previewList[selectedRoulette.rawValue].can)캔으로 룰렛 돌리기")
|
||||
.font(.custom(Font.bold.rawValue, size: 16))
|
||||
.appFont(size: 16, weight: .bold)
|
||||
.foregroundColor(selectedRoulette == .ROULETTE_2 ? .black : .white)
|
||||
.padding(.vertical, 16)
|
||||
.frame(maxWidth: .infinity)
|
||||
|
||||
@@ -57,7 +57,7 @@ struct LiveRoomInfoCreatorView: View {
|
||||
HStack(spacing: 2.7) {
|
||||
if isAdult {
|
||||
Text("19")
|
||||
.font(.custom(Font.bold.rawValue, size: 8))
|
||||
.appFont(size: 8, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
.padding(.vertical, 2.8)
|
||||
.padding(.horizontal, 2)
|
||||
@@ -65,7 +65,7 @@ struct LiveRoomInfoCreatorView: View {
|
||||
}
|
||||
|
||||
Text(roomTitle)
|
||||
.font(.custom(Font.bold.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .bold)
|
||||
.foregroundColor(.grayee)
|
||||
.lineLimit(1)
|
||||
}
|
||||
|
||||
@@ -203,7 +203,7 @@ struct LiveRoomInfoHostView: View {
|
||||
.foregroundColor(.graybb)
|
||||
|
||||
Text("\(participantsCount)")
|
||||
.font(.custom(Font.bold.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .bold)
|
||||
.foregroundColor(.graybb)
|
||||
}
|
||||
.padding(.horizontal, 11)
|
||||
|
||||
@@ -378,7 +378,7 @@ struct LiveRoomViewV2: View {
|
||||
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("[방송공지]")
|
||||
.font(.custom(Font.bold.rawValue, size: 11.3))
|
||||
.appFont(size: 11.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
DetectableTextView(text: liveRoomInfo.notice)
|
||||
@@ -413,7 +413,7 @@ struct LiveRoomViewV2: View {
|
||||
ScrollView(.vertical) {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("[메뉴판]")
|
||||
.font(.custom(Font.bold.rawValue, size: 11.3))
|
||||
.appFont(size: 11.3, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
|
||||
Text(liveRoomInfo.menuPan)
|
||||
|
||||
@@ -15,7 +15,7 @@ struct SectionCommunityPostView: View {
|
||||
VStack(spacing: 16) {
|
||||
HStack(spacing: 0) {
|
||||
Text("커뮤니티")
|
||||
.font(.custom(Font.preBold.rawValue, size: 24))
|
||||
.appFont(size: 24, weight: .bold)
|
||||
.foregroundColor(.button)
|
||||
|
||||
Spacer()
|
||||
|
||||
@@ -17,7 +17,7 @@ struct SectionLatestFinishedLiveView: View {
|
||||
VStack(alignment: .leading, spacing: 16) {
|
||||
HStack(spacing: 0) {
|
||||
Text("최근 종료한 라이브")
|
||||
.font(.custom(Font.preBold.rawValue, size: 24))
|
||||
.appFont(size: 24, weight: .bold)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
.padding(.horizontal, 24)
|
||||
|
||||
Reference in New Issue
Block a user