klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디

Browse Source 
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
Yu Sung
2026-01-23 03:09:20 +09:00
parent d92dcbc696
commit 280e424385
238 changed files with 831 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift
View File

@@ -48,7 +48,7 @@ struct LiveRoomCreateView: View {
if viewModel.isShowGetRecentInfoButton {
Text("최근 데이터 가져오기")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.button)
.padding(.vertical, 8)
.padding(.horizontal, 10.7)
@@ -262,7 +262,7 @@ struct LiveRoomCreateView: 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.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.center)
@@ -290,7 +290,7 @@ struct LiveRoomCreateView: View {
TextField("라이브 제목을 입력하세요", text: $viewModel.title)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
.accentColor(Color.button)
.keyboardType(.default)
@@ -334,7 +334,7 @@ struct LiveRoomCreateView: View {
ForEach(viewModel.tags, id: \.self) { tag in
HStack(spacing: 6.7) {
Text(tag)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(.white)
Image("ic_circle_x")
@@ -365,10 +365,10 @@ struct LiveRoomCreateView: View {
Spacer()
Text("\(viewModel.content.count)자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color.mainRed) +
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.mainRed)
Text(" / 1000자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.gray77)
}
@@ -449,7 +449,7 @@ struct LiveRoomCreateView: View {
HStack(spacing: 13.3) {
VStack(alignment: .leading, spacing: 6.7) {
Text("예약 날짜")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
Button(action: {
@@ -457,7 +457,7 @@ struct LiveRoomCreateView: View {
self.isShowSelectDateView = true
}) {
Text(viewModel.reservationDateString)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
.frame(width: buttonWidth, height: 48.7)
.overlay(
@@ -469,7 +469,7 @@ struct LiveRoomCreateView: View {
VStack(alignment: .leading, spacing: 6.7) {
Text("예약 시간")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
Button(action: {
@@ -477,7 +477,7 @@ struct LiveRoomCreateView: View {
self.isShowSelectTimeView = true
}) {
Text(viewModel.reservationTimeString)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
.frame(width: buttonWidth, height: 48.7)
.overlay(
@@ -504,7 +504,7 @@ struct LiveRoomCreateView: View {
.autocapitalization(.none)
.disableAutocorrection(true)
.multilineTextAlignment(.center)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
.accentColor(Color.button)
.keyboardType(.numberPad)
@@ -642,7 +642,7 @@ struct LiveRoomCreateView: View {
.autocapitalization(.none)
.disableAutocorrection(true)
.multilineTextAlignment(.center)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
.accentColor(Color.button)
.keyboardType(.numberPad)
@@ -736,7 +736,7 @@ struct LiveRoomCreateView: View {
Spacer()
Text("캔")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.button)
}
.padding(.horizontal, 13.3)

4
SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift
View File

@@ -34,7 +34,7 @@ struct LiveRoomCreateTagView: View {
.foregroundColor(.white)
Text("최대 3개까지 선택 가능합니다.")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "777777"))
}
@@ -76,7 +76,7 @@ struct LiveRoomCreateTagView: View {
}
Text(tag.tag)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(
selectedTags.contains(tag.tag) ?
Color.button :

32
SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift
View File

@@ -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)

6
SodaLive/Sources/Live/Room/Dialog/LiveRoomDialogView.swift
View File

@@ -25,7 +25,7 @@ struct LiveRoomDialogView: View {
.frame(width: 36, height: 36)
Text(content)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
}
.padding(.horizontal, 26.7)
@@ -35,7 +35,7 @@ struct LiveRoomDialogView: View {
if let cancelTitle = cancelTitle, let cancelAction = cancelAction {
Text(cancelTitle)
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(.white)
.padding(.horizontal, 8)
.padding(.vertical, 8.3)
@@ -51,7 +51,7 @@ struct LiveRoomDialogView: View {
if let confirmTitle = confirmTitle, let confirmAction = confirmAction {
Text(confirmTitle)
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(Color(hex: "3bb9f1"))
.padding(.horizontal, 8)
.padding(.vertical, 8.3)

6
SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift
View File

@@ -30,7 +30,7 @@ struct LiveRoomDonationMessageDialog: View {
.foregroundColor(Color(hex: "eeeeee"))
Text("(\(viewModel.donationMessageCount))")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Spacer()
@@ -60,7 +60,7 @@ struct LiveRoomDonationMessageDialog: View {
.padding(.top, 18.7)
} else {
Text("후원 히스토리가 없습니다.")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.padding(.top, 30)
}
@@ -80,7 +80,7 @@ struct LiveRoomDonationMessageDialog: View {
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

6
SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageItemView.swift
View File

@@ -17,17 +17,17 @@ struct LiveRoomDonationMessageItemView: View {
HStack(alignment: .top, spacing: 0) {
VStack(alignment: .leading, spacing: 8) {
Text("\(message.nickname)님이")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.white)
if !message.canMessage.trimmingCharacters(in: .whitespaces).isEmpty {
Text("\(message.canMessage)")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.white)
}
Text("'\(message.donationMessage)'")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(.white)
}

8
SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift
View File

@@ -34,16 +34,16 @@ struct LiveRoomDonationRankingDialog: View {
HStack(spacing: 0) {
Text("전체")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
Text(" \(donationStatus.totalCount)")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.button)
.padding(.leading, 6.7)
Text("명")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
Spacer()
@@ -79,7 +79,7 @@ struct LiveRoomDonationRankingDialog: View {
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

12
SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift
View File

@@ -61,7 +61,7 @@ struct LiveRoomDonationRankingItemView: View {
let nickname = item.nickname.count > 10 ? "\(String(item.nickname.prefix(10)))..." : item.nickname
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Spacer()
@@ -70,11 +70,11 @@ struct LiveRoomDonationRankingItemView: View {
if item.can > 0 {
HStack(spacing: 4) {
Text("\(item.can)")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.button)
Text("캔")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
}
}
@@ -82,7 +82,7 @@ struct LiveRoomDonationRankingItemView: View {
if item.secretCan > 0 {
HStack(spacing: 4) {
Text("비밀")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.gray11)
.padding(.horizontal, 3.3)
.padding(.vertical, 2.7)
@@ -90,11 +90,11 @@ struct LiveRoomDonationRankingItemView: View {
.cornerRadius(2.7)
Text("\(item.secretCan)")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "fedc00"))
Text("캔")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
}
}

18
SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift
View File

@@ -20,43 +20,43 @@ struct LiveRoomDonationRankingTotalCanView: View {
if totalSecretCan > 0 {
Text(" (")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayd2)
Text("일반")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.button)
Text("/")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayd2)
Text("비밀")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "fedc00"))
Text(")")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayd2)
}
Spacer()
Text("\(totalCan)")
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color.button)
if totalSecretCan > 0 {
Text("/")
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color.white)
Text("\(totalSecretCan)")
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color(hex: "fedc00"))
}
Text("캔")
.font(.custom(Font.medium.rawValue, size: 10.7))
.appFont(size: 10.7, weight: .medium)
.foregroundColor(Color.graybb)
.padding(.leading, 4)
}

12
SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift
View File

@@ -41,11 +41,11 @@ struct LiveRoomHeartRankingDialog: View {
Spacer()
Text("\(heartStatus.totalHeart)")
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color.button)
Text("하트")
.font(.custom(Font.medium.rawValue, size: 10.7))
.appFont(size: 10.7, weight: .medium)
.foregroundColor(Color.graybb)
.padding(.leading, 4)
}
@@ -57,16 +57,16 @@ struct LiveRoomHeartRankingDialog: View {
HStack(spacing: 0) {
Text("전체")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
Text(" \(heartStatus.totalCount)")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.button)
.padding(.leading, 6.7)
Text("명")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.gray77)
Spacer()
@@ -102,7 +102,7 @@ struct LiveRoomHeartRankingDialog: View {
Text(errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

6
SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift
View File

@@ -61,7 +61,7 @@ struct LiveRoomHeartRankingItemView: View {
let nickname = item.nickname.count > 10 ? "\(String(item.nickname.prefix(10)))..." : item.nickname
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
Spacer()
@@ -70,11 +70,11 @@ struct LiveRoomHeartRankingItemView: View {
if item.heart > 0 {
HStack(spacing: 4) {
Text("\(item.heart)")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.button)
Text("하트")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
}
}

10
SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift
View File

@@ -137,7 +137,7 @@ struct LiveRoomInfoEditDialog: View {
HStack(spacing: 0) {
Text("19세 이상")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
Spacer()
@@ -258,7 +258,7 @@ struct LiveRoomInfoEditDialog: View {
TextField("라이브 제목을 입력하세요", text: $title)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
.accentColor(Color.button)
.keyboardType(.default)
@@ -283,10 +283,10 @@ struct LiveRoomInfoEditDialog: View {
Spacer()
Text("\(notice.count)자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color.mainRed) +
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.mainRed)
Text(" / 1000자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.gray77)
}

4
SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift
View File

@@ -39,12 +39,12 @@ struct LiveRoomNoChattingDialogView: View {
.frame(width: 26.7, height: 26.7)
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 16.7))
.appFont(size: 16.7, weight: .medium)
.foregroundColor(Color(hex: "bbbbbb"))
}
Text("3분간 채팅금지를 하겠습니까?")
.font(.custom(Font.medium.rawValue, size: 15))
.appFont(size: 15, weight: .medium)
.foregroundColor(Color(hex: "bbbbbb"))
HStack(spacing: 13.3) {

4
SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift
View File

@@ -52,7 +52,7 @@ struct LiveRoomProfileDialog: View {
if isSpeaker {
if profileInfo.role == .LISTENER, let onClickInviteSpeaker = onClickInviteSpeaker {
Text("스피커로 초대")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(.button)
.padding(.horizontal, 15.4)
.padding(.vertical, 8.3)
@@ -67,7 +67,7 @@ struct LiveRoomProfileDialog: View {
if (memberId == creatorId || memberId == profileInfo.id) && profileInfo.id != creatorId && profileInfo.role == .SPEAKER,
let onClickChangeListener = onClickChangeListener {
Text("리스너로 변경")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(.button)
.padding(.horizontal, 15.4)
.padding(.vertical, 8.3)

16
SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift
View File

@@ -22,14 +22,14 @@ struct LiveRoomProfileItemTitleView: View {
if let count = count {
Text("\(count)")
.font(.custom(Font.medium.rawValue, size: 13))
.appFont(size: 13, weight: .medium)
.foregroundColor(Color.button)
.padding(.leading, 6.7)
}
if let totalCount = totalCount {
Text("/\(totalCount > 5 ? 5 : totalCount - 1)")
.font(.custom(Font.medium.rawValue, size: 13))
.appFont(size: 13, weight: .medium)
.foregroundColor(Color.graybb)
}
@@ -65,7 +65,7 @@ struct LiveRoomProfileItemMasterView: View {
.padding(.leading, 16.7)
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color.grayee)
.padding(.leading, 4)
}
@@ -114,7 +114,7 @@ struct LiveRoomProfileItemUserView: View {
.padding(.leading, 16.7)
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color.grayee)
.lineLimit(2)
.multilineTextAlignment(.leading)
@@ -122,7 +122,7 @@ struct LiveRoomProfileItemUserView: View {
.padding(.trailing, 10)
} else {
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color.grayee)
.lineLimit(2)
.multilineTextAlignment(.leading)
@@ -133,7 +133,7 @@ struct LiveRoomProfileItemUserView: View {
if role == .LISTENER && isStaff {
Text("스피커로 초대")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(.white)
.padding(.horizontal, 5.5)
.padding(.vertical, 12)
@@ -150,7 +150,7 @@ struct LiveRoomProfileItemUserView: View {
if role == .SPEAKER && (userId == UserDefaults.int(forKey: .userId) || isStaff) {
Text("리스너로 변경")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(.white)
.padding(.horizontal, 5.5)
.padding(.vertical, 12)
@@ -163,7 +163,7 @@ struct LiveRoomProfileItemUserView: View {
if role != .MANAGER && creatorId == UserDefaults.int(forKey: .userId) {
Text("채금")
.font(.custom(Font.medium.rawValue, size: 10))
.appFont(size: 10, weight: .medium)
.foregroundColor(.white)
.padding(.horizontal, 5.5)
.padding(.vertical, 12)

4
SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift
View File

@@ -178,12 +178,12 @@ struct LiveRoomProfilesDialogView: View {
.foregroundColor(Color.grayee)
Text("\(roomInfo.participantsCount)")
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color.button)
.padding(.leading, 6.7)
Text("/\(roomInfo.totalAvailableParticipantsCount)")
.font(.custom(Font.medium.rawValue, size: 14))
.appFont(size: 14, weight: .medium)
.foregroundColor(Color.graybb)
Spacer()

6
SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift
View File

@@ -49,7 +49,7 @@ struct LiveRoomUserProfileDialogView: View {
.foregroundColor(Color.grayee)
Text(userProfile.gender)
.font(.custom(Font.medium.rawValue, size: 11.3))
.appFont(size: 11.3, weight: .medium)
.foregroundColor(.white)
.padding(.horizontal, 5.3)
.padding(.vertical, 3)
@@ -176,7 +176,7 @@ struct LiveRoomUserProfileDialogView: View {
if let _ = userProfile.isFollowing, !userProfile.tags.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
Text(userProfile.tags)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.button)
.lineSpacing(3)
.padding(.top, 21.3)
@@ -184,7 +184,7 @@ struct LiveRoomUserProfileDialogView: View {
if let _ = userProfile.isFollowing, !userProfile.introduce.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
Text(userProfile.introduce)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(Color.button)
.lineLimit(introduceLineLimit)
.lineSpacing(3)

20
SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift
View File

@@ -86,7 +86,7 @@ struct LiveRoomEditView: 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: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.center)
@@ -113,7 +113,7 @@ struct LiveRoomEditView: View {
TextField("라이브 제목을 입력하세요", text: $viewModel.title)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.accentColor(Color(hex: "3bb9f1"))
.keyboardType(.default)
@@ -138,10 +138,10 @@ struct LiveRoomEditView: View {
Spacer()
Text("\(viewModel.notice.count)자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "ff5c49")) +
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "ff5c49"))
Text(" / 1000자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "777777"))
}
@@ -162,7 +162,7 @@ struct LiveRoomEditView: View {
HStack(spacing: 13.3) {
VStack(alignment: .leading, spacing: 6.7) {
Text("예약 날짜")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Button(action: {
@@ -170,7 +170,7 @@ struct LiveRoomEditView: View {
self.isShowSelectDateView = true
}) {
Text(viewModel.reservationDateString)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.frame(width: buttonWidth, height: 48.7)
.overlay(
@@ -182,7 +182,7 @@ struct LiveRoomEditView: View {
VStack(alignment: .leading, spacing: 6.7) {
Text("예약 시간")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Button(action: {
@@ -190,7 +190,7 @@ struct LiveRoomEditView: View {
self.isShowSelectTimeView = true
}) {
Text(viewModel.reservationTimeString)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.frame(width: buttonWidth, height: 48.7)
.overlay(
@@ -217,7 +217,7 @@ struct LiveRoomEditView: View {
.autocapitalization(.none)
.disableAutocorrection(true)
.multilineTextAlignment(.center)
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.accentColor(Color(hex: "3bb9f1"))
.keyboardType(.numberPad)

2
SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift
View File

@@ -24,7 +24,7 @@ struct LiveRoomMenuSelectView: View {
HStack(spacing: 0) {
Text("메뉴를 활성화 하시겠습니까?")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Spacer()

2
SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift
View File

@@ -88,7 +88,7 @@ struct MenuSettingsView: View {
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)

10
SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsOptionView.swift
View File

@@ -19,14 +19,14 @@ struct RouletteSettingsOptionView: View {
VStack(spacing: 6.7) {
HStack(spacing: 0) {
Text("옵션 \(index + 1)")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
Spacer()
if index > 1 {
Text("삭제")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "ff5c49"))
.onTapGesture { onClickDelete() }
}
@@ -36,7 +36,7 @@ struct RouletteSettingsOptionView: View {
TextField("옵션을 입력하세요", text: $option.title)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.keyboardType(.default)
.padding(.horizontal, 13.3)
@@ -49,7 +49,7 @@ struct RouletteSettingsOptionView: View {
TextField("0.00", text: $option.percentage)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
.keyboardType(.decimalPad)
.onChange(of: option.percentage) { newValue in
@@ -61,7 +61,7 @@ struct RouletteSettingsOptionView: View {
}
Text("%")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color(hex: "eeeeee"))
}
.padding(.horizontal, 13.3)

10
SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift
View File

@@ -97,7 +97,7 @@ struct RouletteSettingsView: View {
))
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
.keyboardType(.numberPad)
.padding(.horizontal, 13.3)
@@ -122,7 +122,7 @@ struct RouletteSettingsView: View {
HStack(spacing: 0) {
Text("※ 룰렛 옵션은 최소 2개,\n최대 10개까지 설정할 수 있습니다.")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.mainRed)
Spacer()
@@ -135,13 +135,13 @@ struct RouletteSettingsView: View {
HStack(spacing: 0) {
Text("옵션 확률 합계")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
Spacer()
Text("( \(String(format: "%.2f", viewModel.totalPercentage))% )")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color.grayee)
}
.padding(.top, 21.3)
@@ -224,7 +224,7 @@ struct RouletteSettingsView: 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.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.center)

2
SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift
View File

@@ -101,7 +101,7 @@ struct RoulettePreviewDialog: View {
.foregroundColor(Color(hex: "e2e2e2"))
Text("\(previewList[selectedRoulette.rawValue].items[index].title) (\(previewList[selectedRoulette.rawValue].items[index].percent))")
.font(.custom(Font.medium.rawValue, size: 14.7))
.appFont(size: 14.7, weight: .medium)
.foregroundColor(Color(hex: "e2e2e2"))
}
}

2
SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomNewChatView.swift
View File

@@ -18,7 +18,7 @@ struct LiveRoomNewChatView: View {
HStack(spacing: 6.7) {
Image("ic_bottom_white")
Text("새로운 채팅")
.font(.custom(Font.medium.rawValue, size: 13.3))
.appFont(size: 13.3, weight: .medium)
.foregroundColor(Color.grayee)
}
.padding(.vertical, 8)

2
SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextButton.swift
View File

@@ -19,7 +19,7 @@ struct LiveRoomOverlayStrokeTextButton: View {
var body: some View {
Text(text)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(textColor)
.padding(.horizontal, 8)
.padding(.vertical, 6)

2
SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextToggleButton.swift
View File

@@ -26,7 +26,7 @@ struct LiveRoomOverlayStrokeTextToggleButton: View {
var body: some View {
Text(isOn ? onText : offText != nil && offText?.count ?? 0 > 0 ? offText! : onText)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(isOn ? onTextColor : offTextColor)
.padding(.horizontal, 8)
.padding(.vertical, 6)

2
SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift
View File

@@ -72,7 +72,7 @@ struct LiveRoomInfoCreatorView: View {
HStack(spacing: 5.3) {
Text(creatorNickname)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(.gray77)
.lineLimit(1)

4
SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift
View File

@@ -171,7 +171,7 @@ struct LiveRoomInfoGuestView: View {
.frame(width: 12, height: 12)
Text("\(totalHeart)")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(.graybb)
}
.padding(.horizontal, 11)
@@ -188,7 +188,7 @@ struct LiveRoomInfoGuestView: View {
.frame(width: 12, height: 12)
Text("\(totalDonationCan)")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(.graybb)
}
.padding(.horizontal, 11)

6
SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift
View File

@@ -169,7 +169,7 @@ struct LiveRoomInfoHostView: View {
.frame(width: 12, height: 12)
Text("\(totalHeart)")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(.graybb)
}
.padding(.horizontal, 11)
@@ -186,7 +186,7 @@ struct LiveRoomInfoHostView: View {
.frame(width: 12, height: 12)
Text("\(totalDonationCan)")
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(.graybb)
}
.padding(.horizontal, 11)
@@ -199,7 +199,7 @@ struct LiveRoomInfoHostView: View {
HStack(spacing: 6.7) {
Text(I18n.LiveRoom.participants)
.font(.custom(Font.medium.rawValue, size: 12))
.appFont(size: 12, weight: .medium)
.foregroundColor(.graybb)
Text("\(participantsCount)")

2
SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift
View File

@@ -48,7 +48,7 @@ struct LiveRoomInfoSpeakerView: View {
)
Text(nickname)
.font(.custom(Font.medium.rawValue, fixedSize: 8.7))
.appFont(size: 8.7, weight: .medium)
.foregroundColor(.gray77)
.lineLimit(1)
.truncationMode(.tail)

4
SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift
View File

@@ -445,7 +445,7 @@ struct LiveRoomViewV2: 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.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.center)
@@ -626,7 +626,7 @@ struct LiveRoomViewV2: View {
Text(viewModel.reportMessage)
.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.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.center)