From 9533b06d1eb2811f3ce46ad2e1805c834022a92e Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Fri, 23 Jan 2026 03:46:11 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=98=EB=A8=B8=EC=A7=80=20.font=EB=A5=BC=20?= =?UTF-8?q?.appFont=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=ED=95=9C=EA=B5=AD=EC=96=B4=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=99=80=20=EB=8B=A4=EB=A5=B8=20=EC=96=B8=EC=96=B4=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=97=90=20=EB=8B=A4=EB=A5=B8=20=ED=8F=B0?= =?UTF-8?q?=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Character/Detail/CharacterDetailView.swift | 2 +- SodaLive/Sources/Chat/ChatTabView.swift | 7 +------ .../Content/Create/QuarterTimePickerView.swift | 2 +- .../Content/Create/SelectDatePicker.swift | 2 +- .../Main/V2/ContentMainContentThemeView.swift | 7 +------ .../Content/Main/V2/ContentMainViewV2.swift | 9 +-------- .../Content/Series/DayOfWeekSeriesView.swift | 7 +------ .../Main/ByGenre/SeriesMainGenreView.swift | 7 +------ .../Live/Room/Chat/LiveRoomChatItemView.swift | 6 +++--- .../Chat/LiveRoomDonationChatItemView.swift | 10 +++++----- .../LiveRoomHeartDonationChatItemView.swift | 6 +++--- .../Room/Chat/LiveRoomJoinChatItemView.swift | 6 +++--- .../LiveRoomRouletteDonationChatItemView.swift | 8 ++++---- .../Live/Room/Create/LiveRoomCreateView.swift | 11 +++-------- .../Live/Room/Edit/LiveRoomEditView.swift | 4 ++-- .../Voice/Write/VoiceMessageWriteView.swift | 9 +-------- .../MyPage/Can/Payment/CanPgPaymentView.swift | 4 ++-- .../Can/Payment/Temp/CanPaymentTempView.swift | 6 +++--- SodaLive/Sources/MyPage/MyPageView.swift | 18 +++++++++--------- .../Language/Views/LanguageSettingsView.swift | 2 +- .../UI/Component/SeriesDetailTabView.swift | 2 +- 21 files changed, 48 insertions(+), 87 deletions(-) diff --git a/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift b/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift index 463ccd1..d82af59 100644 --- a/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift +++ b/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift @@ -464,7 +464,7 @@ struct CharacterExpandableTextView: View { Spacer() HStack(spacing: 4) { Image(systemName: "chevron.down") - .font(.system(size: 16)) + .appFont(size: 16) .foregroundColor(Color(hex: "607D8B")) .rotationEffect(.degrees(isExpanded ? 180 : 0)) diff --git a/SodaLive/Sources/Chat/ChatTabView.swift b/SodaLive/Sources/Chat/ChatTabView.swift index c07fd41..1d4ebe6 100644 --- a/SodaLive/Sources/Chat/ChatTabView.swift +++ b/SodaLive/Sources/Chat/ChatTabView.swift @@ -204,12 +204,7 @@ struct ChatInnerTab: View { Spacer() Text(title) - .font( - .custom( - isSelected ? Font.preBold.rawValue : Font.preRegular.rawValue, - size: 18 - ) - ) + .appFont(size: 18, weight: isSelected ? .bold : .regular) .foregroundColor(Color(hex: isSelected ? "3bb9f1" : "b0bec5")) .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Content/Create/QuarterTimePickerView.swift b/SodaLive/Sources/Content/Create/QuarterTimePickerView.swift index cb2e7b2..d032432 100644 --- a/SodaLive/Sources/Content/Create/QuarterTimePickerView.swift +++ b/SodaLive/Sources/Content/Create/QuarterTimePickerView.swift @@ -39,7 +39,7 @@ struct QuarterTimePickerView: View { Button(action: { self.isShowing = false }) { Text("확인") - .font(.system(size: 16)) + .appFont(size: 16) .foregroundColor(Color(hex: "eeeeee")) .padding(.vertical, 10) .frame(width: proxy.size.width) diff --git a/SodaLive/Sources/Content/Create/SelectDatePicker.swift b/SodaLive/Sources/Content/Create/SelectDatePicker.swift index 662cd2b..e19be1d 100644 --- a/SodaLive/Sources/Content/Create/SelectDatePicker.swift +++ b/SodaLive/Sources/Content/Create/SelectDatePicker.swift @@ -29,7 +29,7 @@ struct SelectDatePicker: View { Button(action: { self.isShowing = false }) { Text("확인") - .font(.system(size: 16)) + .appFont(size: 16) .foregroundColor(Color(hex: "eeeeee")) .padding(.vertical, 10) .frame(width: proxy.size.width - 53.4) diff --git a/SodaLive/Sources/Content/Main/V2/ContentMainContentThemeView.swift b/SodaLive/Sources/Content/Main/V2/ContentMainContentThemeView.swift index 68bb361..892eb07 100644 --- a/SodaLive/Sources/Content/Main/V2/ContentMainContentThemeView.swift +++ b/SodaLive/Sources/Content/Main/V2/ContentMainContentThemeView.swift @@ -20,12 +20,7 @@ struct ContentMainContentThemeView: View { ForEach(0.. some View { HStack(spacing: 6.7) { Text(price == 0 ? "무료" : "\(price) 캔") - .font(.custom( - viewModel.price == price ? - Font.bold.rawValue : - Font.medium.rawValue, - size: 14.7 - )) + .appFont(size: 14.7, weight: viewModel.price == price ? .bold : .medium) .foregroundColor(viewModel.price == price ? Color.button : Color.gray77) } .frame(width: buttonWidth, height: 48.7) diff --git a/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift b/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift index b35076d..7f7f568 100644 --- a/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift +++ b/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift @@ -246,7 +246,7 @@ struct LiveRoomEditView: View { Button(action: { self.isShowSelectDateView = false }) { Text("확인") - .font(.system(size: 16)) + .appFont(size: 16) .foregroundColor(Color(hex: "eeeeee")) .padding(.vertical, 10) .frame(width: proxy.size.width - 53.4) @@ -277,7 +277,7 @@ struct LiveRoomEditView: View { Button(action: { self.isShowSelectTimeView = false }) { Text("확인") - .font(.system(size: 16)) + .appFont(size: 16) .foregroundColor(Color(hex: "eeeeee")) .padding(.vertical, 10) .frame(width: proxy.size.width) diff --git a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift index 549bc25..8eb1567 100644 --- a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift +++ b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift @@ -66,14 +66,7 @@ struct VoiceMessageWriteView: View { viewModel.recipientNickname : I18n.TextMessage.recipientPlaceholder ) - .font( - .custom( - viewModel.recipientNickname.count > 0 ? - Font.bold.rawValue : - Font.light.rawValue, - size: 16.7 - ) - ) + .appFont(size: 16.7, weight: viewModel.recipientNickname.count > 0 ? .bold : .light) .foregroundColor( Color( hex: diff --git a/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift b/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift index c3be638..006b4de 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift @@ -137,7 +137,7 @@ struct CanPgPaymentView: View { HStack(spacing: 16.7) { 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) .frame(maxWidth: .infinity) .padding(.vertical, 16.7) @@ -180,7 +180,7 @@ struct CanPgPaymentView: View { } 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) .frame(maxWidth: .infinity) .padding(.vertical, 16.7) diff --git a/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift b/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift index 0ed59de..fbcd1fd 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift @@ -98,7 +98,7 @@ struct CanPaymentTempView: View { HStack(spacing: 13.3) { 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) .frame(width: (screenSize().width - 40) / 2) .padding(.vertical, 16.7) @@ -121,7 +121,7 @@ struct CanPaymentTempView: View { 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) .frame(width: (screenSize().width - 40) / 2) .padding(.vertical, 16.7) @@ -147,7 +147,7 @@ struct CanPaymentTempView: View { HStack(spacing: 13.3) { 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) .frame(width: (screenSize().width - 40) / 2) .padding(.vertical, 16.7) diff --git a/SodaLive/Sources/MyPage/MyPageView.swift b/SodaLive/Sources/MyPage/MyPageView.swift index 1a637d0..3b85d83 100644 --- a/SodaLive/Sources/MyPage/MyPageView.swift +++ b/SodaLive/Sources/MyPage/MyPageView.swift @@ -233,14 +233,14 @@ struct UpdateBannerView: View { var body: some View { HStack { Text("\(item.title)") - .font(.system(size: 16)) + .appFont(size: 16) .foregroundColor(Color(hex: "B0BEC5")) Spacer() HStack(spacing: 2) { Text("자세히") - .font(.system(size: 16)) + .appFont(size: 16) .foregroundColor(Color(hex: "B0BEC5")) Image(systemName: "chevron.right") @@ -277,7 +277,7 @@ struct ProfileSectionView: View { VStack(alignment: .leading) { Text("\(nickname)") - .font(.system(size: 18, weight: .bold)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) } @@ -293,7 +293,7 @@ struct ProfileSectionView: View { .background(Color(hex: "263238")) .foregroundColor(.white) .cornerRadius(9999) - .font(.system(size: 16)) + .appFont(size: 16) } } } @@ -316,7 +316,7 @@ struct CanPointCardsView: View { Image("ic_can") Text("\(can)") - .font(.system(size: 18, weight: .bold)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) Image(systemName: "chevron.right") @@ -343,14 +343,14 @@ struct CanPointCardsView: View { .background(Color.button) .cornerRadius(9999) .foregroundColor(.white) - .font(.system(size: 16, weight: .bold)) + .appFont(size: 16, weight: .bold) } else { Text("") .padding(.horizontal, 16) .padding(.vertical, 11) .background(Color.clear) .foregroundColor(.white) - .font(.system(size: 16, weight: .bold)) + .appFont(size: 16, weight: .bold) } } .padding(15) @@ -361,7 +361,7 @@ struct CanPointCardsView: View { Image("ic_point") Text("\(point)") - .font(.system(size: 18, weight: .bold)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) Image(systemName: "chevron.right") @@ -384,7 +384,7 @@ struct CanPointCardsView: View { .padding(.vertical, 11) .background(Color.clear) .foregroundColor(.white) - .font(.system(size: 16, weight: .bold)) + .appFont(size: 16, weight: .bold) } .padding(15) } diff --git a/SodaLive/Sources/Settings/Language/Views/LanguageSettingsView.swift b/SodaLive/Sources/Settings/Language/Views/LanguageSettingsView.swift index d6a339e..ce32a3a 100644 --- a/SodaLive/Sources/Settings/Language/Views/LanguageSettingsView.swift +++ b/SodaLive/Sources/Settings/Language/Views/LanguageSettingsView.swift @@ -32,7 +32,7 @@ struct LanguageSettingsView: View { Spacer() if viewModel.pending == option { Image(systemName: "checkmark") - .font(.system(size: 16, weight: .semibold)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.white) } } diff --git a/SodaLive/Sources/UI/Component/SeriesDetailTabView.swift b/SodaLive/Sources/UI/Component/SeriesDetailTabView.swift index 6121ba3..b4232e1 100644 --- a/SodaLive/Sources/UI/Component/SeriesDetailTabView.swift +++ b/SodaLive/Sources/UI/Component/SeriesDetailTabView.swift @@ -17,7 +17,7 @@ struct SeriesDetailTabView: View { var body: some View { VStack(spacing: 0) { 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) .frame(width: width, height: 50)