나머지 .font를 .appFont로 변경하여 한국어 텍스트와 다른 언어 텍스트에 다른 폰트 적용

This commit is contained in:
Yu Sung
2026-01-23 03:46:11 +09:00
parent b3331d5512
commit 9533b06d1e
21 changed files with 48 additions and 87 deletions

View File

@@ -464,7 +464,7 @@ struct CharacterExpandableTextView: View {
Spacer() Spacer()
HStack(spacing: 4) { HStack(spacing: 4) {
Image(systemName: "chevron.down") Image(systemName: "chevron.down")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color(hex: "607D8B")) .foregroundColor(Color(hex: "607D8B"))
.rotationEffect(.degrees(isExpanded ? 180 : 0)) .rotationEffect(.degrees(isExpanded ? 180 : 0))

View File

@@ -204,12 +204,7 @@ struct ChatInnerTab: View {
Spacer() Spacer()
Text(title) Text(title)
.font( .appFont(size: 18, weight: isSelected ? .bold : .regular)
.custom(
isSelected ? Font.preBold.rawValue : Font.preRegular.rawValue,
size: 18
)
)
.foregroundColor(Color(hex: isSelected ? "3bb9f1" : "b0bec5")) .foregroundColor(Color(hex: isSelected ? "3bb9f1" : "b0bec5"))
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)

View File

@@ -39,7 +39,7 @@ struct QuarterTimePickerView: View {
Button(action: { self.isShowing = false }) { Button(action: { self.isShowing = false }) {
Text("확인") Text("확인")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color(hex: "eeeeee"))
.padding(.vertical, 10) .padding(.vertical, 10)
.frame(width: proxy.size.width) .frame(width: proxy.size.width)

View File

@@ -29,7 +29,7 @@ struct SelectDatePicker: View {
Button(action: { self.isShowing = false }) { Button(action: { self.isShowing = false }) {
Text("확인") Text("확인")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color(hex: "eeeeee"))
.padding(.vertical, 10) .padding(.vertical, 10)
.frame(width: proxy.size.width - 53.4) .frame(width: proxy.size.width - 53.4)

View File

@@ -20,12 +20,7 @@ struct ContentMainContentThemeView: View {
ForEach(0..<themeList.count, id: \.self) { index in ForEach(0..<themeList.count, id: \.self) { index in
let theme = themeList[index] let theme = themeList[index]
Text(theme) Text(theme)
.font( .appFont(size: 16, weight: selectedTheme == theme ? .bold : .regular)
.custom(
selectedTheme == theme ? Font.preBold.rawValue : Font.preRegular.rawValue,
size: 16
)
)
.foregroundColor(.white) .foregroundColor(.white)
.padding(.horizontal, 24) .padding(.horizontal, 24)
.padding(.vertical, 12) .padding(.vertical, 12)

View File

@@ -72,14 +72,7 @@ struct ContentMainViewV2: View {
let tabItem = tabItemList[index] let tabItem = tabItemList[index]
Text(tabItem.title) Text(tabItem.title)
.font( .appFont(size: 16, weight: selectedTab == tabItem.tab ? .bold : .medium)
.custom(
selectedTab == tabItem.tab ?
Font.bold.rawValue :
Font.medium.rawValue,
size: 16
)
)
.foregroundColor( .foregroundColor(
selectedTab == tabItem.tab ? selectedTab == tabItem.tab ?
.button : .button :

View File

@@ -98,12 +98,7 @@ struct DayOfWeekDayView: View {
var body: some View { var body: some View {
Text(dayOfWeek) Text(dayOfWeek)
.font( .appFont(size: 18, weight: isSelected ? .bold : .regular)
.custom(
isSelected ? Font.preBold.rawValue : Font.preRegular.rawValue,
size: 18
)
)
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 8) .padding(.vertical, 8)
.padding(.horizontal, 11) .padding(.horizontal, 11)

View File

@@ -19,12 +19,7 @@ struct SeriesMainGenreView: View {
ForEach(0..<genreList.count, id: \.self) { index in ForEach(0..<genreList.count, id: \.self) { index in
let genre = genreList[index] let genre = genreList[index]
Text(genre.genre) Text(genre.genre)
.font( .appFont(size: 16, weight: selectedGenre.genre == genre.genre ? .bold : .regular)
.custom(
selectedGenre.genre == genre.genre ? Font.preBold.rawValue : Font.preRegular.rawValue,
size: 16
)
)
.foregroundColor(.white) .foregroundColor(.white)
.padding(.horizontal, 24) .padding(.horizontal, 24)
.padding(.vertical, 12) .padding(.vertical, 12)

View File

@@ -102,7 +102,7 @@ struct LiveRoomChatItemView: View {
HStack(spacing: 5) { HStack(spacing: 5) {
if chatMessage.rank == -3 { if chatMessage.rank == -3 {
Text("스탭") Text("스탭")
.font(.system(size: 10)) .appFont(size: 10)
.foregroundColor(.white) .foregroundColor(.white)
.padding(2) .padding(2)
.background(Color(hex: "4999e3")) .background(Color(hex: "4999e3"))
@@ -110,12 +110,12 @@ struct LiveRoomChatItemView: View {
} }
Text(chatMessage.nickname) Text(chatMessage.nickname)
.font(.system(size: 12, weight: .light)) .appFont(size: 12, weight: .light)
.foregroundColor(.white) .foregroundColor(.white)
} }
Text(chatMessage.chat) Text(chatMessage.chat)
.font(.system(size: 15)) .appFont(size: 15)
.foregroundColor(.white) .foregroundColor(.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.lineLimit(nil) .lineLimit(nil)

View File

@@ -37,27 +37,27 @@ struct LiveRoomDonationChatItemView: View {
VStack(alignment: .leading, spacing: 6.7) { VStack(alignment: .leading, spacing: 6.7) {
HStack(spacing: 0) { HStack(spacing: 0) {
Text(chatMessage.nickname) Text(chatMessage.nickname)
.font(.system(size: 12)) .appFont(size: 12)
.foregroundColor(.white) .foregroundColor(.white)
Text("님이") Text("님이")
.font(.system(size: 12, weight: .light)) .appFont(size: 12, weight: .light)
.foregroundColor(.white) .foregroundColor(.white)
} }
HStack(spacing: 0) { HStack(spacing: 0) {
Text("\(chatMessage.can)") Text("\(chatMessage.can)")
.font(.system(size: 15)) .appFont(size: 15)
.foregroundColor(Color(hex: "fdca2f")) .foregroundColor(Color(hex: "fdca2f"))
Text(chatMessage.chat.contains("비밀") ? "으로 비밀미션을 보냈습니다.🤫" : "을 후원하셨습니다.💰🪙") Text(chatMessage.chat.contains("비밀") ? "으로 비밀미션을 보냈습니다.🤫" : "을 후원하셨습니다.💰🪙")
.font(.system(size: 15)) .appFont(size: 15)
.foregroundColor(.white) .foregroundColor(.white)
} }
if !chatMessage.donationMessage.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { if !chatMessage.donationMessage.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
Text("\"\(chatMessage.donationMessage)\"") Text("\"\(chatMessage.donationMessage)\"")
.font(.system(size: 15)) .appFont(size: 15)
.foregroundColor(.white) .foregroundColor(.white)
} }
} }

View File

@@ -14,15 +14,15 @@ struct LiveRoomHeartDonationChatItemView: View {
var body: some View { var body: some View {
HStack(spacing: 0) { HStack(spacing: 0) {
Text("'") Text("'")
.font(.system(size: 12)) .appFont(size: 12)
.foregroundColor(Color.white) .foregroundColor(Color.white)
Text(nickname) Text(nickname)
.font(.system(size: 12, weight: .bold)) .appFont(size: 12, weight: .bold)
.foregroundColor(Color(hex: "ec3aa6")) .foregroundColor(Color(hex: "ec3aa6"))
Text("'님이 마음을 전했습니다 : 💕") Text("'님이 마음을 전했습니다 : 💕")
.font(.system(size: 12)) .appFont(size: 12)
.foregroundColor(Color.gray11) .foregroundColor(Color.gray11)
} }
.padding(.vertical, 6.7) .padding(.vertical, 6.7)

View File

@@ -14,15 +14,15 @@ struct LiveRoomJoinChatItemView: View {
var body: some View { var body: some View {
HStack(spacing: 0) { HStack(spacing: 0) {
Text("'") Text("'")
.font(.system(size: 12)) .appFont(size: 12)
.foregroundColor(Color.grayee) .foregroundColor(Color.grayee)
Text(chatMessage.nickname) Text(chatMessage.nickname)
.font(.system(size: 12, weight: .bold)) .appFont(size: 12, weight: .bold)
.foregroundColor(Color.mainYellow) .foregroundColor(Color.mainYellow)
Text("'님이 입장하셨습니다.") Text("'님이 입장하셨습니다.")
.font(.system(size: 12)) .appFont(size: 12)
.foregroundColor(Color.grayee) .foregroundColor(Color.grayee)
} }
.padding(.vertical, 6.7) .padding(.vertical, 6.7)

View File

@@ -37,22 +37,22 @@ struct LiveRoomRouletteDonationChatItemView: View {
VStack(alignment: .leading, spacing: 6.7) { VStack(alignment: .leading, spacing: 6.7) {
HStack(spacing: 0) { HStack(spacing: 0) {
Text(chatMessage.nickname) Text(chatMessage.nickname)
.font(.system(size: 12)) .appFont(size: 12)
.foregroundColor(.white) .foregroundColor(.white)
Text("님의 룰렛 결과?") Text("님의 룰렛 결과?")
.font(.system(size: 12, weight: .light)) .appFont(size: 12, weight: .light)
.foregroundColor(.white) .foregroundColor(.white)
} }
Text("[\(chatMessage.rouletteResult)]") Text("[\(chatMessage.rouletteResult)]")
.font(.system(size: 15)) .appFont(size: 15)
.foregroundColor(Color(hex: "ffe500")) .foregroundColor(Color(hex: "ffe500"))
+ +
Text(" 당첨!") Text(" 당첨!")
.font(.system(size: 15)) .appFont(size: 15)
.foregroundColor(.white) .foregroundColor(.white)
} }
} }

View File

@@ -533,7 +533,7 @@ struct LiveRoomCreateView: View {
Button(action: { self.isShowSelectDateView = false }) { Button(action: { self.isShowSelectDateView = false }) {
Text("확인") Text("확인")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color.grayee) .foregroundColor(Color.grayee)
.padding(.vertical, 10) .padding(.vertical, 10)
.frame(width: proxy.size.width - 53.4) .frame(width: proxy.size.width - 53.4)
@@ -564,7 +564,7 @@ struct LiveRoomCreateView: View {
Button(action: { self.isShowSelectTimeView = false }) { Button(action: { self.isShowSelectTimeView = false }) {
Text("확인") Text("확인")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color.grayee) .foregroundColor(Color.grayee)
.padding(.vertical, 10) .padding(.vertical, 10)
.frame(width: proxy.size.width) .frame(width: proxy.size.width)
@@ -753,12 +753,7 @@ struct LiveRoomCreateView: View {
func PriceButtonView(price: Int, buttonWidth: CGFloat) -> some View { func PriceButtonView(price: Int, buttonWidth: CGFloat) -> some View {
HStack(spacing: 6.7) { HStack(spacing: 6.7) {
Text(price == 0 ? "무료" : "\(price)") Text(price == 0 ? "무료" : "\(price)")
.font(.custom( .appFont(size: 14.7, weight: viewModel.price == price ? .bold : .medium)
viewModel.price == price ?
Font.bold.rawValue :
Font.medium.rawValue,
size: 14.7
))
.foregroundColor(viewModel.price == price ? Color.button : Color.gray77) .foregroundColor(viewModel.price == price ? Color.button : Color.gray77)
} }
.frame(width: buttonWidth, height: 48.7) .frame(width: buttonWidth, height: 48.7)

View File

@@ -246,7 +246,7 @@ struct LiveRoomEditView: View {
Button(action: { self.isShowSelectDateView = false }) { Button(action: { self.isShowSelectDateView = false }) {
Text("확인") Text("확인")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color(hex: "eeeeee"))
.padding(.vertical, 10) .padding(.vertical, 10)
.frame(width: proxy.size.width - 53.4) .frame(width: proxy.size.width - 53.4)
@@ -277,7 +277,7 @@ struct LiveRoomEditView: View {
Button(action: { self.isShowSelectTimeView = false }) { Button(action: { self.isShowSelectTimeView = false }) {
Text("확인") Text("확인")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color(hex: "eeeeee"))
.padding(.vertical, 10) .padding(.vertical, 10)
.frame(width: proxy.size.width) .frame(width: proxy.size.width)

View File

@@ -66,14 +66,7 @@ struct VoiceMessageWriteView: View {
viewModel.recipientNickname : viewModel.recipientNickname :
I18n.TextMessage.recipientPlaceholder I18n.TextMessage.recipientPlaceholder
) )
.font( .appFont(size: 16.7, weight: viewModel.recipientNickname.count > 0 ? .bold : .light)
.custom(
viewModel.recipientNickname.count > 0 ?
Font.bold.rawValue :
Font.light.rawValue,
size: 16.7
)
)
.foregroundColor( .foregroundColor(
Color( Color(
hex: hex:

View File

@@ -137,7 +137,7 @@ struct CanPgPaymentView: View {
HStack(spacing: 16.7) { HStack(spacing: 16.7) {
Text("통합 결제") Text("통합 결제")
.font(.custom( viewModel.paymentMethod == .unified ? Font.bold.rawValue : Font.medium.rawValue, size: 16.7)) .appFont(size: 16.7, weight: viewModel.paymentMethod == .unified ? .bold : .medium)
.foregroundColor(viewModel.paymentMethod == .unified ? Color.button : Color.grayee) .foregroundColor(viewModel.paymentMethod == .unified ? Color.button : Color.grayee)
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.padding(.vertical, 16.7) .padding(.vertical, 16.7)
@@ -180,7 +180,7 @@ struct CanPgPaymentView: View {
} }
Text("휴대폰 결제") Text("휴대폰 결제")
.font(.custom( viewModel.paymentMethod == .phone ? Font.bold.rawValue : Font.medium.rawValue, size: 16.7)) .appFont(size: 16.7, weight: viewModel.paymentMethod == .phone ? .bold : .medium)
.foregroundColor(viewModel.paymentMethod == .phone ? Color.button : Color.grayee) .foregroundColor(viewModel.paymentMethod == .phone ? Color.button : Color.grayee)
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.padding(.vertical, 16.7) .padding(.vertical, 16.7)

View File

@@ -98,7 +98,7 @@ struct CanPaymentTempView: View {
HStack(spacing: 13.3) { HStack(spacing: 13.3) {
Text("카드") Text("카드")
.font(.custom( viewModel.paymentMethod == .card ? Font.bold.rawValue : Font.medium.rawValue, size: 16.7)) .appFont(size: 16.7, weight: viewModel.paymentMethod == .card ? .bold : .medium)
.foregroundColor(viewModel.paymentMethod == .card ? Color.button : Color.grayee) .foregroundColor(viewModel.paymentMethod == .card ? Color.button : Color.grayee)
.frame(width: (screenSize().width - 40) / 2) .frame(width: (screenSize().width - 40) / 2)
.padding(.vertical, 16.7) .padding(.vertical, 16.7)
@@ -121,7 +121,7 @@ struct CanPaymentTempView: View {
Text("계좌이체") Text("계좌이체")
.font(.custom( viewModel.paymentMethod == .bank ? Font.bold.rawValue : Font.medium.rawValue, size: 16.7)) .appFont(size: 16.7, weight: viewModel.paymentMethod == .bank ? .bold : .medium)
.foregroundColor(viewModel.paymentMethod == .bank ? Color.button : Color.grayee) .foregroundColor(viewModel.paymentMethod == .bank ? Color.button : Color.grayee)
.frame(width: (screenSize().width - 40) / 2) .frame(width: (screenSize().width - 40) / 2)
.padding(.vertical, 16.7) .padding(.vertical, 16.7)
@@ -147,7 +147,7 @@ struct CanPaymentTempView: View {
HStack(spacing: 13.3) { HStack(spacing: 13.3) {
Text("휴대폰 결제") Text("휴대폰 결제")
.font(.custom( viewModel.paymentMethod == .phone ? Font.bold.rawValue : Font.medium.rawValue, size: 16.7)) .appFont(size: 16.7, weight: viewModel.paymentMethod == .phone ? .bold : .medium)
.foregroundColor(viewModel.paymentMethod == .phone ? Color.button : Color.grayee) .foregroundColor(viewModel.paymentMethod == .phone ? Color.button : Color.grayee)
.frame(width: (screenSize().width - 40) / 2) .frame(width: (screenSize().width - 40) / 2)
.padding(.vertical, 16.7) .padding(.vertical, 16.7)

View File

@@ -233,14 +233,14 @@ struct UpdateBannerView: View {
var body: some View { var body: some View {
HStack { HStack {
Text("\(item.title)") Text("\(item.title)")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color(hex: "B0BEC5")) .foregroundColor(Color(hex: "B0BEC5"))
Spacer() Spacer()
HStack(spacing: 2) { HStack(spacing: 2) {
Text("자세히") Text("자세히")
.font(.system(size: 16)) .appFont(size: 16)
.foregroundColor(Color(hex: "B0BEC5")) .foregroundColor(Color(hex: "B0BEC5"))
Image(systemName: "chevron.right") Image(systemName: "chevron.right")
@@ -277,7 +277,7 @@ struct ProfileSectionView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text("\(nickname)") Text("\(nickname)")
.font(.system(size: 18, weight: .bold)) .appFont(size: 18, weight: .bold)
.foregroundColor(.white) .foregroundColor(.white)
} }
@@ -293,7 +293,7 @@ struct ProfileSectionView: View {
.background(Color(hex: "263238")) .background(Color(hex: "263238"))
.foregroundColor(.white) .foregroundColor(.white)
.cornerRadius(9999) .cornerRadius(9999)
.font(.system(size: 16)) .appFont(size: 16)
} }
} }
} }
@@ -316,7 +316,7 @@ struct CanPointCardsView: View {
Image("ic_can") Image("ic_can")
Text("\(can)") Text("\(can)")
.font(.system(size: 18, weight: .bold)) .appFont(size: 18, weight: .bold)
.foregroundColor(.white) .foregroundColor(.white)
Image(systemName: "chevron.right") Image(systemName: "chevron.right")
@@ -343,14 +343,14 @@ struct CanPointCardsView: View {
.background(Color.button) .background(Color.button)
.cornerRadius(9999) .cornerRadius(9999)
.foregroundColor(.white) .foregroundColor(.white)
.font(.system(size: 16, weight: .bold)) .appFont(size: 16, weight: .bold)
} else { } else {
Text("") Text("")
.padding(.horizontal, 16) .padding(.horizontal, 16)
.padding(.vertical, 11) .padding(.vertical, 11)
.background(Color.clear) .background(Color.clear)
.foregroundColor(.white) .foregroundColor(.white)
.font(.system(size: 16, weight: .bold)) .appFont(size: 16, weight: .bold)
} }
} }
.padding(15) .padding(15)
@@ -361,7 +361,7 @@ struct CanPointCardsView: View {
Image("ic_point") Image("ic_point")
Text("\(point)") Text("\(point)")
.font(.system(size: 18, weight: .bold)) .appFont(size: 18, weight: .bold)
.foregroundColor(.white) .foregroundColor(.white)
Image(systemName: "chevron.right") Image(systemName: "chevron.right")
@@ -384,7 +384,7 @@ struct CanPointCardsView: View {
.padding(.vertical, 11) .padding(.vertical, 11)
.background(Color.clear) .background(Color.clear)
.foregroundColor(.white) .foregroundColor(.white)
.font(.system(size: 16, weight: .bold)) .appFont(size: 16, weight: .bold)
} }
.padding(15) .padding(15)
} }

View File

@@ -32,7 +32,7 @@ struct LanguageSettingsView: View {
Spacer() Spacer()
if viewModel.pending == option { if viewModel.pending == option {
Image(systemName: "checkmark") Image(systemName: "checkmark")
.font(.system(size: 16, weight: .semibold)) .appFont(size: 16, weight: .bold)
.foregroundColor(Color.white) .foregroundColor(Color.white)
} }
} }

View File

@@ -17,7 +17,7 @@ struct SeriesDetailTabView: View {
var body: some View { var body: some View {
VStack(spacing: 0) { VStack(spacing: 0) {
Text(title) Text(title)
.font(.custom(isSelected ? Font.bold.rawValue : Font.medium.rawValue, size: 16.7)) .appFont(size: 16.7, weight: isSelected ? .bold : .medium)
.foregroundColor(isSelected ? Color.button : Color.gray77) .foregroundColor(isSelected ? Color.button : Color.gray77)
.frame(width: width, height: 50) .frame(width: width, height: 50)