From d92dcbc6964df4f299c0bf2500df16004707105f Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Fri, 23 Jan 2026 02:57:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=85=80=20=ED=8F=B0?= =?UTF-8?q?=ED=8A=B8=20pretendard-bold,=20gmarket-bold=EB=A5=BC=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EA=B3=A0=20=EC=9E=88=EB=8D=98=20?= =?UTF-8?q?=EA=B2=83=EC=9D=84=20appFont=20=EB=AA=A8=EB=94=94=ED=8C=8C?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=A5=BC=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=97=AC=20=ED=95=9C=EA=B5=AD=EC=96=B4=EB=8A=94=20pretendard,?= =?UTF-8?q?=20=EA=B7=B8=20=EC=99=B8=EC=97=90=EB=8A=94=20=EC=8B=9C=EC=8A=A4?= =?UTF-8?q?=ED=85=9C=20=ED=8F=B0=ED=8A=B8=EB=A5=BC=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Audition/Applicant/ApplyMethodView.swift | 2 +- .../AuditionApplicantRecordingView.swift | 8 ++-- .../Applicant/AuditionApplyView.swift | 6 +-- SodaLive/Sources/Audition/AuditionView.swift | 10 ++--- .../Audition/Detail/AuditionDetailView.swift | 4 +- .../Role/AuditionRoleDetailView.swift | 8 ++-- .../Chat/Character/CharacterItemView.swift | 2 +- .../Chat/Character/CharacterSectionView.swift | 2 +- .../Chat/Character/CharacterView.swift | 2 +- .../Detail/CharacterDetailView.swift | 16 +++---- .../Gallery/CharacterDetailGalleryView.swift | 4 +- .../Recent/RecentCharacterSectionView.swift | 4 +- .../Detail/OriginalWorkDetailHeaderView.swift | 2 +- .../Detail/OriginalWorkDetailView.swift | 6 +-- .../Sources/Chat/Talk/Room/ChatRoomView.swift | 4 +- .../Talk/Room/Message/AiMessageItemView.swift | 4 +- .../Room/Quota/ChatQuotaNoticeItemView.swift | 8 ++-- .../Talk/Room/Settings/ChatSettingsView.swift | 8 ++-- SodaLive/Sources/Chat/Talk/TalkItemView.swift | 2 +- .../Content/All/ContentRankingAllView.swift | 4 +- .../Sources/Content/ContentListView.swift | 4 +- .../Create/ContentCreateSelectThemeView.swift | 2 +- .../Content/Create/ContentCreateView.swift | 44 +++++++++---------- .../Detail/AudioContentDeleteDialogView.swift | 6 +-- .../Detail/AudioContentReportDialogView.swift | 6 +-- .../Comment/AudioContentCommentItemView.swift | 2 +- .../ContentDetailInfoLimitedEditionView.swift | 8 ++-- .../Detail/ContentDetailInfoView.swift | 2 +- .../ContentDetailOtherContentView.swift | 2 +- .../Detail/ContentDetailPlayView.swift | 2 +- .../Detail/ContentDetailPurchaseButton.swift | 4 +- .../Content/Detail/ContentDetailView.swift | 6 +-- .../ContentOrderConfirmDialogView.swift | 14 +++--- .../Detail/ContentOrderDialogView.swift | 16 +++---- .../Detail/LiveRoomDonationDialogView.swift | 16 +++---- .../Content/Main/ContentMainView.swift | 8 ++-- .../ContentMainCurationItemView.swift | 2 +- .../ContentMainNewContentView.swift | 2 +- .../Main/Order/ContentMainMyStashView.swift | 2 +- .../ContentMainCreatorRankingView.swift | 10 ++--- .../Main/Ranking/ContentMainRankingView.swift | 6 +-- .../ContentMainRecommendSeriesView.swift | 2 +- .../ContentMainTabRankContentView.swift | 4 +- .../Content/ContentMainTagCurationView.swift | 2 +- .../Main/V2/ContentByChannelView.swift | 2 +- .../Main/V2/ContentMainCurationViewV2.swift | 2 +- .../Main/V2/ContentMainNewContentViewV2.swift | 2 +- .../Content/Main/V2/ContentMainViewV2.swift | 2 +- .../Main/V2/Home/ContentMainTabHomeView.swift | 4 +- .../ContentMainTabHomeRankCreatorView.swift | 10 ++--- .../ContentMainTabHomeRankSeriesView.swift | 2 +- .../ContentMainCompletedSeriesView.swift | 2 +- .../ContentMainNewOrRecommendSeriesView.swift | 2 +- .../Series/ContentMainSeriesByGenreView.swift | 2 +- .../ContentMainSeriesCurationView.swift | 2 +- .../Series/ContentMainSeriesRankingView.swift | 4 +- .../ContentMainOriginalAudioDramaView.swift | 2 +- .../Main/V2/Series/SeriesByChannelView.swift | 2 +- .../Content/Modify/ContentModifyView.swift | 16 +++---- .../Playlist/ContentPlaylistItemView.swift | 2 +- .../Playlist/ContentPlaylistListView.swift | 4 +- .../Create/ContentPlaylistCreateView.swift | 12 ++--- .../Create/PlaylistAddContentView.swift | 2 +- .../Detail/ContentPlaylistDetailView.swift | 6 +-- .../Modify/ContentPlaylistModifyView.swift | 12 ++--- .../Content/Series/DayOfWeekSeriesView.swift | 2 +- .../Series/Detail/SeriesDetailHomeView.swift | 2 +- .../Detail/SeriesDetailIntroductionView.swift | 8 ++-- .../Series/Detail/SeriesDetailView.swift | 2 +- .../Series/Main/Home/SeriesMainHomeView.swift | 4 +- .../Dialog/ApplyAuditionCompleteDialog.swift | 6 +-- .../Dialog/CommunityPostPurchaseDialog.swift | 6 +-- .../Dialog/CreatorFollowNotifyDialog.swift | 2 +- .../Sources/Dialog/LivePaymentDialog.swift | 6 +-- .../Dialog/LiveRoomPasswordDialog.swift | 10 ++--- .../Sources/Dialog/MemberProfileDialog.swift | 10 ++--- SodaLive/Sources/Dialog/SodaDialog.swift | 6 +-- .../Explorer/ExplorerSectionView.swift | 10 ++--- .../All/CreatorCommunityAllItemLockView.swift | 2 +- .../CreatorCommunityItemView.swift | 2 +- .../CreatorCommunityNoPostsItemView.swift | 2 +- .../Modify/CreatorCommunityModifyView.swift | 12 ++--- .../CreatorCommunityRecordingVoiceView.swift | 8 ++-- .../Write/CreatorCommunityWriteView.swift | 18 ++++---- .../UserProfileFanTalkCheersItemView.swift | 8 ++-- .../FanTalk/UserProfileFanTalkView.swift | 2 +- .../FollowerList/FollowerListView.swift | 2 +- .../Series/UserProfileSeriesView.swift | 2 +- .../UserProfileActivitySummaryView.swift | 2 +- .../Profile/UserProfileContentView.swift | 6 +-- .../Profile/UserProfileDonationAllView.swift | 16 +++---- .../Profile/UserProfileDonationView.swift | 2 +- .../Profile/UserProfileIntroduceView.swift | 2 +- .../Profile/UserProfileLiveView.swift | 8 ++-- .../Explorer/Profile/UserProfileView.swift | 12 ++--- .../Follow/FollowCreatorItemView.swift | 2 +- .../Sources/Home/HomeLatestContentView.swift | 2 +- SodaLive/Sources/Home/HomeTabView.swift | 16 +++---- .../Home/HomeWeeklyChartItemView.swift | 2 +- .../Sources/Home/HomeWeeklyChartView.swift | 2 +- .../RecommendChannelItemView.swift | 4 +- .../Live/Cancel/LiveCancelDialog.swift | 6 +-- .../Sources/Live/LiveReplayListView.swift | 2 +- SodaLive/Sources/Live/LiveView.swift | 2 +- .../Sources/Live/Now/SectionLiveNowView.swift | 2 +- .../SectionRecommendChannelView.swift | 4 +- .../Reservation/All/WeekCalendarView.swift | 2 +- .../LiveReservationCompleteView.swift | 16 +++---- .../Reservation/LiveReservationItemView.swift | 4 +- .../MyLiveReservationItemView.swift | 6 +-- .../SectionLiveReservationView.swift | 2 +- .../Live/Room/Create/LiveRoomCreateView.swift | 36 +++++++-------- .../Create/Tag/LiveRoomCreateTagView.swift | 4 +- .../Live/Room/Detail/LiveDetailView.swift | 16 +++---- .../LiveRoomDonationMessageDialog.swift | 2 +- .../LiveRoomDonationRankingDialog.swift | 2 +- .../LiveRoomDonationRankingItemView.swift | 2 +- .../LiveRoomDonationRankingTotalCanView.swift | 2 +- .../Dialog/LiveRoomHeartRankingDialog.swift | 4 +- .../Dialog/LiveRoomHeartRankingItemView.swift | 2 +- .../Room/Dialog/LiveRoomInfoEditDialog.swift | 14 +++--- .../Dialog/LiveRoomNoChattingDialogView.swift | 6 +-- .../Room/Dialog/LiveRoomProfileDialog.swift | 2 +- .../Dialog/LiveRoomProfileItemTitleView.swift | 4 +- .../Dialog/LiveRoomProfilesDialogView.swift | 2 +- .../LiveRoomUserProfileDialogView.swift | 12 ++--- .../Live/Room/Edit/LiveRoomEditView.swift | 8 ++-- .../Room/Menu/LiveRoomMenuSelectView.swift | 2 +- .../Live/Room/Menu/MenuSettingsView.swift | 2 +- .../Config/RouletteSettingsView.swift | 12 ++--- .../Routlette/RoulettePreviewDialog.swift | 10 ++--- .../View/LiveRoomInfoCreatorView.swift | 4 +- .../Component/View/LiveRoomInfoHostView.swift | 2 +- .../Sources/Live/Room/V2/LiveRoomViewV2.swift | 4 +- .../Live/SectionCommunityPostView.swift | 2 +- .../Live/SectionLatestFinishedLiveView.swift | 2 +- .../Text/Detail/TextMessageDetailView.swift | 10 ++--- .../Text/Write/TextMessageWriteView.swift | 4 +- .../Message/Voice/VoiceMessageView.swift | 6 +-- .../Voice/Write/VoiceMessageWriteView.swift | 6 +-- .../Sources/MyPage/Auth/AuthButtonView.swift | 2 +- .../MyPage/Can/Charge/CanChargeView.swift | 8 ++-- .../Coupon/CanChargeCouponButtonView.swift | 2 +- .../MyPage/Can/Coupon/CanCouponView.swift | 8 ++-- .../MyPage/Can/Payment/CanPaymentView.swift | 8 ++-- .../MyPage/Can/Payment/CanPgPaymentView.swift | 12 ++--- .../Can/Payment/Temp/CanPaymentTempView.swift | 10 ++--- .../MyPage/Can/Status/CanStatusView.swift | 8 ++-- .../MyPage/Can/Status/CanUseStatusView.swift | 2 +- SodaLive/Sources/MyPage/CanCardView.swift | 4 +- SodaLive/Sources/MyPage/MyInfoCardView.swift | 2 +- SodaLive/Sources/MyPage/MyPageView.swift | 8 ++-- .../MyPage/OrderList/OrderListAllView.swift | 2 +- .../MyPage/OrderList/OrderListView.swift | 2 +- .../MyPage/Point/PointStatusView.swift | 2 +- .../Profile/Nickname/NicknameUpdateView.swift | 4 +- .../Profile/Password/ModifyPasswordView.swift | 2 +- .../MyPage/Profile/ProfileUpdateView.swift | 16 +++---- .../MyPage/Profile/Tag/MemberTagView.swift | 4 +- .../Cancel/LiveReservationCancelView.swift | 6 +-- .../LiveReservationStatusItemView.swift | 2 +- .../MyPage/ReservationStatusView.swift | 4 +- .../MyPage/ServiceCenter/FaqView.swift | 4 +- .../ServiceCenterButtonView.swift | 2 +- .../ServiceCenter/ServiceCenterView.swift | 6 +-- .../NavigationBar/DetailNavigationBar.swift | 2 +- .../NavigationBar/HomeNavigationBar.swift | 2 +- .../Sources/Onboarding/OnboardingView.swift | 2 +- .../Sources/Search/SearchUnifiedView.swift | 2 +- .../Content/ContentSettingsView.swift | 2 +- .../Settings/Event/EventDetailView.swift | 2 +- .../Language/Views/LanguageSettingsView.swift | 2 +- .../NotificationSettingsDialog.swift | 8 ++-- .../NotificationSettingsView.swift | 6 +-- SodaLive/Sources/Settings/SettingsView.swift | 14 +++--- .../Settings/SignOut/SignOutView.swift | 4 +- SodaLive/Sources/Splash/SplashView.swift | 4 +- .../UI/Component/SelectedButtonView.swift | 2 +- .../User/FindPassword/FindPasswordView.swift | 4 +- SodaLive/Sources/User/Login/LoginView.swift | 2 +- SodaLive/Sources/User/SignUp/SignUpView.swift | 2 +- 181 files changed, 500 insertions(+), 500 deletions(-) diff --git a/SodaLive/Sources/Audition/Applicant/ApplyMethodView.swift b/SodaLive/Sources/Audition/Applicant/ApplyMethodView.swift index 207bef7..28e760a 100644 --- a/SodaLive/Sources/Audition/Applicant/ApplyMethodView.swift +++ b/SodaLive/Sources/Audition/Applicant/ApplyMethodView.swift @@ -31,7 +31,7 @@ struct ApplyMethodView: View { } Text("오디션 지원방식") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.graybb) .padding(.top, 33.3) diff --git a/SodaLive/Sources/Audition/Applicant/AuditionApplicantRecordingView.swift b/SodaLive/Sources/Audition/Applicant/AuditionApplicantRecordingView.swift index c99fc2f..ab79c5f 100644 --- a/SodaLive/Sources/Audition/Applicant/AuditionApplicantRecordingView.swift +++ b/SodaLive/Sources/Audition/Applicant/AuditionApplicantRecordingView.swift @@ -31,7 +31,7 @@ struct AuditionApplicantRecordingView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("오디션 녹음") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) Spacer() @@ -46,7 +46,7 @@ struct AuditionApplicantRecordingView: View { } Text(soundManager.timeString) - .font(.custom(Font.bold.rawValue, size: 33.3)) + .appFont(size: 33.3, weight: .bold) .foregroundColor(.white) .padding(.top, 80) @@ -114,7 +114,7 @@ struct AuditionApplicantRecordingView: View { HStack(spacing: 13.3) { Text("다시 녹음") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.button) .frame(width: (proxy.size.width - 40) / 3, height: 50) .background(Color.button.opacity(0.2)) @@ -130,7 +130,7 @@ struct AuditionApplicantRecordingView: View { } Text("녹음완료") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .frame(width: (proxy.size.width - 40) * 2 / 3, height: 50) .background(Color.button) diff --git a/SodaLive/Sources/Audition/Applicant/AuditionApplyView.swift b/SodaLive/Sources/Audition/Applicant/AuditionApplyView.swift index f18567c..e34fb4e 100644 --- a/SodaLive/Sources/Audition/Applicant/AuditionApplyView.swift +++ b/SodaLive/Sources/Audition/Applicant/AuditionApplyView.swift @@ -46,7 +46,7 @@ struct AuditionApplyView: View { } Text("녹음파일") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(.grayee) .padding(.top, 20) @@ -67,7 +67,7 @@ struct AuditionApplyView: View { .padding(.top, 10) Text("연락처") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(.grayee) .padding(.top, 15) @@ -101,7 +101,7 @@ struct AuditionApplyView: View { } Text("오디션 지원하기") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) .padding(.vertical, 13.3) .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Audition/AuditionView.swift b/SodaLive/Sources/Audition/AuditionView.swift index a6675dc..1b26052 100644 --- a/SodaLive/Sources/Audition/AuditionView.swift +++ b/SodaLive/Sources/Audition/AuditionView.swift @@ -25,7 +25,7 @@ struct AuditionView: View { .frame(width: 20, height: 20) Text("오디션") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } @@ -74,11 +74,11 @@ struct AuditionView: View { VStack(alignment: .leading, spacing: 25) { HStack(spacing: 0) { Text("오디션") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) Text(" ON") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.mainRed) Spacer() @@ -112,11 +112,11 @@ struct AuditionView: View { HStack(spacing: 0) { Text("오디션") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) Text(" OFF") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.graybb) Spacer() diff --git a/SodaLive/Sources/Audition/Detail/AuditionDetailView.swift b/SodaLive/Sources/Audition/Detail/AuditionDetailView.swift index 7500541..c9a498c 100644 --- a/SodaLive/Sources/Audition/Detail/AuditionDetailView.swift +++ b/SodaLive/Sources/Audition/Detail/AuditionDetailView.swift @@ -31,7 +31,7 @@ struct AuditionDetailView: View { .cornerRadius(6.7) Text("오디션 정보") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) .padding(.top, 15) @@ -39,7 +39,7 @@ struct AuditionDetailView: View { .padding(.top, 13.3) Text("오디션 캐릭터") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) .padding(.top, 15) diff --git a/SodaLive/Sources/Audition/Role/AuditionRoleDetailView.swift b/SodaLive/Sources/Audition/Role/AuditionRoleDetailView.swift index 944f0f2..ad82378 100644 --- a/SodaLive/Sources/Audition/Role/AuditionRoleDetailView.swift +++ b/SodaLive/Sources/Audition/Role/AuditionRoleDetailView.swift @@ -46,7 +46,7 @@ struct AuditionRoleDetailView: View { HStack(spacing: 14) { if let url = URL(string: roleDetail.originalWorkUrl), UIApplication.shared.canOpenURL(url) { Text("원작 보러가기") - .font(.custom(Font.bold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.button) .padding(.vertical, 12) .frame(maxWidth: .infinity) @@ -60,7 +60,7 @@ struct AuditionRoleDetailView: View { if let url = URL(string: roleDetail.auditionScriptUrl), UIApplication.shared.canOpenURL(url) { Text("오디션 대본 확인") - .font(.custom(Font.bold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.button) .padding(.vertical, 12) .frame(maxWidth: .infinity) @@ -75,7 +75,7 @@ struct AuditionRoleDetailView: View { VStack(alignment: .leading, spacing: 13.3) { Text("오디션 캐릭터 정보") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) ExpandableTextView(text: roleDetail.information) @@ -190,7 +190,7 @@ struct AuditionRoleDetailView: View { if let roleDetail = viewModel.auditionRoleDetail { Text(roleDetail.isAlreadyApplicant ? "오디션 재지원" : "오디션 지원") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color.white) .padding(14) .background(Color.button) diff --git a/SodaLive/Sources/Chat/Character/CharacterItemView.swift b/SodaLive/Sources/Chat/Character/CharacterItemView.swift index 06712ff..b621995 100644 --- a/SodaLive/Sources/Chat/Character/CharacterItemView.swift +++ b/SodaLive/Sources/Chat/Character/CharacterItemView.swift @@ -48,7 +48,7 @@ struct CharacterItemView: View { if isShowRank { Text("\(rank)") - .font(.custom(Font.preBold.rawValue, size: 72)) + .appFont(size: 72, weight: .bold) .foregroundColor(.white) .lineLimit(1) .frame(height: capHeight) diff --git a/SodaLive/Sources/Chat/Character/CharacterSectionView.swift b/SodaLive/Sources/Chat/Character/CharacterSectionView.swift index 24ca2e3..59e2177 100644 --- a/SodaLive/Sources/Chat/Character/CharacterSectionView.swift +++ b/SodaLive/Sources/Chat/Character/CharacterSectionView.swift @@ -19,7 +19,7 @@ struct CharacterSectionView: View { VStack(alignment: .leading, spacing: 16) { HStack(spacing: 0) { Text(title) - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() if let trailingTitle = trailingTitle { diff --git a/SodaLive/Sources/Chat/Character/CharacterView.swift b/SodaLive/Sources/Chat/Character/CharacterView.swift index 84decd8..6b2d409 100644 --- a/SodaLive/Sources/Chat/Character/CharacterView.swift +++ b/SodaLive/Sources/Chat/Character/CharacterView.swift @@ -68,7 +68,7 @@ struct CharacterView: View { VStack(alignment: .leading, spacing: 16) { HStack { Text("추천 캐릭터") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift b/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift index caf8a14..25a0cde 100644 --- a/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift +++ b/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift @@ -78,7 +78,7 @@ struct CharacterDetailView: View { VStack(spacing: 16) { HStack { Text("장르의 다른 캐릭터") - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(.white) Spacer() @@ -263,7 +263,7 @@ extension CharacterDetailView { // 이름과 상태 HStack(spacing: 8) { Text(viewModel.characterDetail?.translated?.name ?? viewModel.characterDetail?.name ?? "") - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(.white) .lineLimit(1) .truncationMode(.tail) @@ -301,7 +301,7 @@ extension CharacterDetailView { VStack(alignment: .leading, spacing: 8) { HStack { Text("[세계관 및 작품 소개]") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) Spacer() @@ -319,7 +319,7 @@ extension CharacterDetailView { VStack(spacing: 8) { HStack { Text("원작") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .fontWeight(.bold) .foregroundColor(.white) @@ -340,7 +340,7 @@ extension CharacterDetailView { } }) { Text("원작 보러가기") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .fontWeight(.bold) .foregroundColor(Color(hex: "3BB9F1")) .frame(maxWidth: .infinity) @@ -361,7 +361,7 @@ extension CharacterDetailView { VStack(alignment: .leading, spacing: 8) { HStack { Text("[성격 및 특징]") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) Spacer() @@ -373,7 +373,7 @@ extension CharacterDetailView { VStack(alignment: .leading, spacing: 16) { HStack { Text("⚠️ 캐릭터톡 대화 가이드") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "B0BEC5")) Spacer() @@ -412,7 +412,7 @@ extension CharacterDetailView { extension CharacterDetailView { private var chatButton: some View { Text("대화하기") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) .frame(maxWidth: .infinity) .frame(height: 54) diff --git a/SodaLive/Sources/Chat/Character/Detail/Gallery/CharacterDetailGalleryView.swift b/SodaLive/Sources/Chat/Character/Detail/Gallery/CharacterDetailGalleryView.swift index 72dd7f8..e8a6d38 100644 --- a/SodaLive/Sources/Chat/Character/Detail/Gallery/CharacterDetailGalleryView.swift +++ b/SodaLive/Sources/Chat/Character/Detail/Gallery/CharacterDetailGalleryView.swift @@ -95,7 +95,7 @@ struct CharacterDetailGalleryView: View { // 상단 정보 (계산된 % 보유중, 정보 아이콘, 개수) HStack { Text("\(viewModel.ownershipPercentage)% 보유중") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) Spacer() @@ -181,7 +181,7 @@ struct CharacterDetailGalleryView: View { .frame(width: 16) Text("\(item.imagePriceCan)") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "#263238")) } .padding(.horizontal, 12) diff --git a/SodaLive/Sources/Chat/Character/Recent/RecentCharacterSectionView.swift b/SodaLive/Sources/Chat/Character/Recent/RecentCharacterSectionView.swift index b3eb30a..6e31ef9 100644 --- a/SodaLive/Sources/Chat/Character/Recent/RecentCharacterSectionView.swift +++ b/SodaLive/Sources/Chat/Character/Recent/RecentCharacterSectionView.swift @@ -16,11 +16,11 @@ struct RecentCharacterSectionView: View { VStack(alignment: .leading, spacing: 16) { HStack(spacing: 0) { Text("최근 대화한 캐릭터 ") - .font(.custom(Font.preBold.rawValue, size: 20)) + .appFont(size: 20, weight: .bold) .foregroundColor(.white) Text("\(titleCount)") - .font(.custom(Font.preBold.rawValue, size: 20)) + .appFont(size: 20, weight: .bold) .foregroundColor(Color(hex: "FDCA2F")) Spacer() diff --git a/SodaLive/Sources/Chat/Original/Detail/OriginalWorkDetailHeaderView.swift b/SodaLive/Sources/Chat/Original/Detail/OriginalWorkDetailHeaderView.swift index 7d6d4f0..d632f5a 100644 --- a/SodaLive/Sources/Chat/Original/Detail/OriginalWorkDetailHeaderView.swift +++ b/SodaLive/Sources/Chat/Original/Detail/OriginalWorkDetailHeaderView.swift @@ -26,7 +26,7 @@ struct OriginalWorkDetailHeaderView: View { // 번역 데이터가 있으면 번역값을 우선 사용 Text(item.translated?.title ?? item.title) - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(.white) .padding(.top, 40) diff --git a/SodaLive/Sources/Chat/Original/Detail/OriginalWorkDetailView.swift b/SodaLive/Sources/Chat/Original/Detail/OriginalWorkDetailView.swift index 0ce3905..46d27c0 100644 --- a/SodaLive/Sources/Chat/Original/Detail/OriginalWorkDetailView.swift +++ b/SodaLive/Sources/Chat/Original/Detail/OriginalWorkDetailView.swift @@ -157,7 +157,7 @@ struct OriginalWorkInfoView: View { VStack(spacing: 16) { VStack(alignment: .leading, spacing: 8) { Text("작품 소개") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(.white) Text(response.translated?.description ?? response.description) @@ -176,7 +176,7 @@ struct OriginalWorkInfoView: View { VStack(alignment: .leading, spacing: 8) { Text("원작 보러 가기") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "B0BEC5")) ScrollView(.horizontal, showsIndicators: false) { @@ -203,7 +203,7 @@ struct OriginalWorkInfoView: View { VStack(alignment: .leading, spacing: 8) { Text("상세 정보") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(.white) HStack(spacing: 16) { diff --git a/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift b/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift index 4e83f2f..44c175a 100644 --- a/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift +++ b/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift @@ -46,13 +46,13 @@ struct ChatRoomView: View { VStack(alignment: .leading, spacing: 4) { Text(viewModel.characterName) - .font(.custom(Font.preBold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(.white) .lineLimit(1) .truncationMode(.tail) Text(viewModel.characterType.rawValue) - .font(.custom(Font.preBold.rawValue, size: 10)) + .appFont(size: 10, weight: .bold) .foregroundColor(.white) .padding(.horizontal, 4) .padding(.vertical, 2) diff --git a/SodaLive/Sources/Chat/Talk/Room/Message/AiMessageItemView.swift b/SodaLive/Sources/Chat/Talk/Room/Message/AiMessageItemView.swift index 092846b..ed5b4b0 100644 --- a/SodaLive/Sources/Chat/Talk/Room/Message/AiMessageItemView.swift +++ b/SodaLive/Sources/Chat/Talk/Room/Message/AiMessageItemView.swift @@ -117,7 +117,7 @@ struct AiMessageItemView: View { .frame(width: 24, height: 24) Text("\(message.price ?? 5)") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "263238")) } .padding(.horizontal, 10) @@ -131,7 +131,7 @@ struct AiMessageItemView: View { } Text("눌러서 잠금해제") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) } .frame(width: maxWidth, height: imageHeight) diff --git a/SodaLive/Sources/Chat/Talk/Room/Quota/ChatQuotaNoticeItemView.swift b/SodaLive/Sources/Chat/Talk/Room/Quota/ChatQuotaNoticeItemView.swift index 960e11d..4953d28 100644 --- a/SodaLive/Sources/Chat/Talk/Room/Quota/ChatQuotaNoticeItemView.swift +++ b/SodaLive/Sources/Chat/Talk/Room/Quota/ChatQuotaNoticeItemView.swift @@ -20,11 +20,11 @@ struct ChatQuotaNoticeItemView: View { .frame(width: 30, height: 30) Text(remainingTime) - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) Text("기다리면 무료 이용이 가능합니다.") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) } .frame(maxWidth: .infinity) @@ -36,11 +36,11 @@ struct ChatQuotaNoticeItemView: View { Image("ic_can") Text("10") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(Color(hex: "263238")) Text("(채팅 12개) 바로 대화 시작") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(Color(hex: "263238")) .padding(.leading, 4) } diff --git a/SodaLive/Sources/Chat/Talk/Room/Settings/ChatSettingsView.swift b/SodaLive/Sources/Chat/Talk/Room/Settings/ChatSettingsView.swift index 65e48d0..35ae149 100644 --- a/SodaLive/Sources/Chat/Talk/Room/Settings/ChatSettingsView.swift +++ b/SodaLive/Sources/Chat/Talk/Room/Settings/ChatSettingsView.swift @@ -26,7 +26,7 @@ struct ChatSettingsView: View { VStack(spacing: 0) { Toggle(isOn: $isHideBg) { Text("배경 이미지 끄기") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(Color(hex: "B0BEC5")) } .toggleStyle(.switch) @@ -43,7 +43,7 @@ struct ChatSettingsView: View { VStack(spacing: 0) { HStack { Text("배경 이미지 변경") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(Color(hex: "B0BEC5")) .padding(.horizontal, 24) .padding(.vertical, 12) @@ -62,7 +62,7 @@ struct ChatSettingsView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 6) { Text("대화 초기화") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(Color(hex: "B0BEC5")) HStack(alignment: .top, spacing: 0) { @@ -85,7 +85,7 @@ struct ChatSettingsView: View { .frame(width: 24, height: 24) Text("30") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "263238")) } .padding(.vertical, 3) diff --git a/SodaLive/Sources/Chat/Talk/TalkItemView.swift b/SodaLive/Sources/Chat/Talk/TalkItemView.swift index 0b0fa4e..3b098bd 100644 --- a/SodaLive/Sources/Chat/Talk/TalkItemView.swift +++ b/SodaLive/Sources/Chat/Talk/TalkItemView.swift @@ -24,7 +24,7 @@ struct TalkItemView: View { VStack(alignment: .leading, spacing: 6) { HStack(spacing: 4) { Text(item.title) - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) .lineLimit(1) diff --git a/SodaLive/Sources/Content/All/ContentRankingAllView.swift b/SodaLive/Sources/Content/All/ContentRankingAllView.swift index 07a25d9..e37af94 100644 --- a/SodaLive/Sources/Content/All/ContentRankingAllView.swift +++ b/SodaLive/Sources/Content/All/ContentRankingAllView.swift @@ -20,7 +20,7 @@ struct ContentRankingAllView: View { VStack(spacing: 8) { Text("\(viewModel.dateString)") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.") @@ -63,7 +63,7 @@ struct ContentRankingAllView: View { .cornerRadius(5.3) Text("\(index + 1)") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "3bb9f1")) .padding(.horizontal, 12) diff --git a/SodaLive/Sources/Content/ContentListView.swift b/SodaLive/Sources/Content/ContentListView.swift index 84dcbdb..4b50609 100644 --- a/SodaLive/Sources/Content/ContentListView.swift +++ b/SodaLive/Sources/Content/ContentListView.swift @@ -25,7 +25,7 @@ struct ContentListView: View { .frame(width: 20, height: 20) Text("콘텐츠 전체보기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } @@ -46,7 +46,7 @@ struct ContentListView: View { if userId == UserDefaults.int(forKey: .userId) { Text("새로운 콘텐츠 등록하기") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.vertical, 17) .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Content/Create/ContentCreateSelectThemeView.swift b/SodaLive/Sources/Content/Create/ContentCreateSelectThemeView.swift index ce202e2..b455bb3 100644 --- a/SodaLive/Sources/Content/Create/ContentCreateSelectThemeView.swift +++ b/SodaLive/Sources/Content/Create/ContentCreateSelectThemeView.swift @@ -29,7 +29,7 @@ struct ContentCreateSelectThemeView: View { VStack(spacing: 0) { HStack(alignment: .top, spacing: 0) { Text("테마 선택") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Content/Create/ContentCreateView.swift b/SodaLive/Sources/Content/Create/ContentCreateView.swift index 7438c06..bcd2b42 100644 --- a/SodaLive/Sources/Content/Create/ContentCreateView.swift +++ b/SodaLive/Sources/Content/Create/ContentCreateView.swift @@ -29,7 +29,7 @@ struct ContentCreateView: View { ScrollView(.vertical, showsIndicators: false) { VStack(spacing: 0) { Text("썸네일") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -62,7 +62,7 @@ struct ContentCreateView: View { .onTapGesture { isShowPhotoPicker = true } Text("등록") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 13.3) @@ -92,7 +92,7 @@ struct ContentCreateView: View { VStack(spacing: 0) { Text("제목") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -110,7 +110,7 @@ struct ContentCreateView: View { HStack(spacing: 0) { Text("내용") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -135,7 +135,7 @@ struct ContentCreateView: View { .padding(.top, 13.3) Text("테마") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 26.7) @@ -158,7 +158,7 @@ struct ContentCreateView: View { Text(viewModel.theme != nil ? viewModel.theme!.theme : I18n.CreateContent.selectTheme) - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.button) } .padding(.vertical, viewModel.theme != nil ? 8 : 13.3) @@ -177,7 +177,7 @@ struct ContentCreateView: View { } Text("태그") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 26.7) @@ -204,7 +204,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("가격 설정") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -225,7 +225,7 @@ struct ContentCreateView: View { if !viewModel.isFree { VStack(spacing: 13.3) { Text("소장 설정") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -261,7 +261,7 @@ struct ContentCreateView: View { TextField("가격을 입력하세요(5캔 이상)", text: $viewModel.priceString) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) .cornerRadius(6.7) .keyboardType(.numberPad) @@ -305,7 +305,7 @@ struct ContentCreateView: View { if viewModel.price > 0 && viewModel.purchaseOption != .RENT_ONLY { VStack(spacing: 13.3) { Text("한정판 설정") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -327,7 +327,7 @@ struct ContentCreateView: View { TextField("한정판 개수를 입력하세요", text: $viewModel.limitedString) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) .cornerRadius(6.7) .keyboardType(.numberPad) @@ -342,7 +342,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("포인트 사용") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -364,7 +364,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("미리듣기") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -387,7 +387,7 @@ struct ContentCreateView: View { if viewModel.isGeneratePreview { VStack(spacing: 10) { Text("미리듣기 시간 설정") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -406,7 +406,7 @@ struct ContentCreateView: View { TextField("00:00:00", text: $viewModel.previewStartTime) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.bold.rawValue, size: 14.6)) + .appFont(size: 14.6, weight: .bold) .foregroundColor(Color.gray77) .padding(.vertical, 16.7) .padding(.horizontal, 13.3) @@ -425,7 +425,7 @@ struct ContentCreateView: View { TextField("00:00:15", text: $viewModel.previewEndTime) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.bold.rawValue, size: 14.6)) + .appFont(size: 14.6, weight: .bold) .foregroundColor(Color.gray77) .padding(.vertical, 16.7) .padding(.horizontal, 13.3) @@ -446,7 +446,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("연령 제한") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -475,7 +475,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("댓글 가능 여부") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -498,7 +498,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text(I18n.CreateContent.publishReserved) - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -573,7 +573,7 @@ struct ContentCreateView: View { VStack(spacing: 0) { HStack(alignment: .top, spacing: 0) { Text("등록") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.white) .frame(height: 50) .frame(maxWidth: .infinity) @@ -697,7 +697,7 @@ struct SelectButtonView: View { } Text(title) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(isChecked ? .white : Color.main) } .frame(height: 48.7) diff --git a/SodaLive/Sources/Content/Detail/AudioContentDeleteDialogView.swift b/SodaLive/Sources/Content/Detail/AudioContentDeleteDialogView.swift index 2d0a8c2..832b4f3 100644 --- a/SodaLive/Sources/Content/Detail/AudioContentDeleteDialogView.swift +++ b/SodaLive/Sources/Content/Detail/AudioContentDeleteDialogView.swift @@ -20,7 +20,7 @@ struct AudioContentDeleteDialogView: 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: "eeeeee")) Text("[\(title)]을 삭제하시겠습니까?") @@ -57,7 +57,7 @@ struct AudioContentDeleteDialogView: View { HStack(spacing: 12) { Text("취소") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "9970ff")) .padding(.horizontal, 55) .padding(.vertical, 16) @@ -71,7 +71,7 @@ struct AudioContentDeleteDialogView: View { } Text("확인") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.horizontal, 55) .padding(.vertical, 16) diff --git a/SodaLive/Sources/Content/Detail/AudioContentReportDialogView.swift b/SodaLive/Sources/Content/Detail/AudioContentReportDialogView.swift index 67968f7..1268649 100644 --- a/SodaLive/Sources/Content/Detail/AudioContentReportDialogView.swift +++ b/SodaLive/Sources/Content/Detail/AudioContentReportDialogView.swift @@ -32,7 +32,7 @@ struct AudioContentReportDialogView: View { VStack(spacing: 13.3) { Text("콘텐츠 신고") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) VStack(spacing: 13.3) { @@ -66,7 +66,7 @@ struct AudioContentReportDialogView: View { HStack(spacing: 12) { 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 - 100) / 2) @@ -80,7 +80,7 @@ struct AudioContentReportDialogView: View { } Text("신고") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.vertical, 16) .frame(width: (screenSize().width - 100) / 2) diff --git a/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentItemView.swift b/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentItemView.swift index 0efb224..9a4326b 100644 --- a/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentItemView.swift +++ b/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentItemView.swift @@ -82,7 +82,7 @@ struct AudioContentCommentItemView: View { .frame(width: 13.3, height: 13.3) Text("\(commentItem.donationCan)") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(.white) } .padding(.horizontal, 6.7) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailInfoLimitedEditionView.swift b/SodaLive/Sources/Content/Detail/ContentDetailInfoLimitedEditionView.swift index 9c07b34..dd19f89 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailInfoLimitedEditionView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailInfoLimitedEditionView.swift @@ -26,12 +26,12 @@ struct ContentDetailInfoLimitedEditionView: View { if let orderSequence = orderSequence { Text("\(orderSequence)") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.button) .padding(.leading, 5.3) Text("/") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayd2) .padding(.leading, 2.3) @@ -56,7 +56,7 @@ struct ContentDetailInfoLimitedEditionView: View { .foregroundColor(Color.grayd2) Text("\(remainingContentCount)") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.button) .padding(.leading, 5.3) } @@ -70,7 +70,7 @@ struct ContentDetailInfoLimitedEditionView: View { if !buyerList.isEmpty { Text("구매자") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) ScrollView(.horizontal, showsIndicators: false) { diff --git a/SodaLive/Sources/Content/Detail/ContentDetailInfoView.swift b/SodaLive/Sources/Content/Detail/ContentDetailInfoView.swift index db3b0e5..4c3634a 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailInfoView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailInfoView.swift @@ -81,7 +81,7 @@ struct ContentDetailInfoView: View { } Text(audioContent.translated?.title ?? audioContent.title) - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayd2) .lineSpacing(5) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailOtherContentView.swift b/SodaLive/Sources/Content/Detail/ContentDetailOtherContentView.swift index 0b9c6cd..f9c35ed 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailOtherContentView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailOtherContentView.swift @@ -16,7 +16,7 @@ struct ContentDetailOtherContentView: View { var body: some View { VStack(spacing: 21.3) { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame(maxWidth: .infinity, alignment: .leading) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailPlayView.swift b/SodaLive/Sources/Content/Detail/ContentDetailPlayView.swift index a441091..3fc15d4 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailPlayView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailPlayView.swift @@ -63,7 +63,7 @@ struct ContentDetailPlayView: View { if let _ = audioContent.totalContentCount, let remainingContentCount = audioContent.remainingContentCount, remainingContentCount <= 0, audioContent.creator.creatorId != UserDefaults.int(forKey: .userId), !audioContent.existOrdered { Text("Sold Out") - .font(.custom(Font.bold.rawValue, size: 36.7)) + .appFont(size: 36.7, weight: .bold) .foregroundColor(.white) .frame( width: screenSize().width - 26.7, diff --git a/SodaLive/Sources/Content/Detail/ContentDetailPurchaseButton.swift b/SodaLive/Sources/Content/Detail/ContentDetailPurchaseButton.swift index 52beca6..a402c32 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailPurchaseButton.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailPurchaseButton.swift @@ -22,7 +22,7 @@ struct ContentDetailPurchaseButton: View { } Text(UserDefaults.int(forKey: .userId) == 17958 ? "\(price * 110)" : "\(price)") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(.white) .padding(.leading, 5.3) @@ -31,7 +31,7 @@ struct ContentDetailPurchaseButton: View { .foregroundColor(.white) Text(title) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(.white) } .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailView.swift b/SodaLive/Sources/Content/Detail/ContentDetailView.swift index d2a7425..1e6584e 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailView.swift @@ -39,7 +39,7 @@ struct ContentDetailView: View { .frame(width: 20, height: 20) Text("콘텐츠 상세") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) } @@ -109,7 +109,7 @@ struct ContentDetailView: View { if let releaseDate = audioContent.releaseDate { Text(releaseDate) - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.white) .frame(maxWidth: .infinity) .frame(height: 48.7) @@ -123,7 +123,7 @@ struct ContentDetailView: View { audioContent.creator.creatorId != UserDefaults.int(forKey: .userId) { if let _ = audioContent.totalContentCount, let remainingContentCount = audioContent.remainingContentCount, remainingContentCount <= 0 { Text("해당 콘텐츠가 매진되었습니다.") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.white) .frame(maxWidth: .infinity) .frame(height: 48.7) diff --git a/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift b/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift index 242415d..8720506 100644 --- a/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift +++ b/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift @@ -36,7 +36,7 @@ struct ContentOrderConfirmDialogView: View { VStack(spacing: 0) { Text("구매확인") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) HStack(spacing: 11) { @@ -64,7 +64,7 @@ struct ContentOrderConfirmDialogView: View { .cornerRadius(2) Text(title) - .font(.custom(Font.bold.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .bold) .foregroundColor(Color.grayd2) .padding(.top, 2) @@ -127,7 +127,7 @@ struct ContentOrderConfirmDialogView: View { .frame(width: 16.7, height: 16.7) Text("\(usablePoint)") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } } @@ -145,13 +145,13 @@ struct ContentOrderConfirmDialogView: View { .frame(width: 16.7, height: 16.7) Text("\(remainingCan)") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } } } else { Text("\(price * 110)원") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } @@ -169,7 +169,7 @@ struct ContentOrderConfirmDialogView: View { HStack(spacing: 12) { Text("취소") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.button) .padding(.vertical, 15.7) .frame(maxWidth: .infinity) @@ -182,7 +182,7 @@ struct ContentOrderConfirmDialogView: View { .onTapGesture { isShowing = false } Text("확인") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .padding(.vertical, 15.7) .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Content/Detail/ContentOrderDialogView.swift b/SodaLive/Sources/Content/Detail/ContentOrderDialogView.swift index 4659c07..73248d3 100644 --- a/SodaLive/Sources/Content/Detail/ContentOrderDialogView.swift +++ b/SodaLive/Sources/Content/Detail/ContentOrderDialogView.swift @@ -28,7 +28,7 @@ struct ContentOrderDialogView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 5.3) { Text("대여") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.white) Text("(이용기간 5일)") @@ -47,17 +47,17 @@ struct ContentOrderDialogView: View { if UserDefaults.int(forKey: .userId) == 17958 { Text("\(Int(ceil(Double(price) * 0.7)) * 110)") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } else { Text("\(Int(ceil(Double(price) * 0.7)))") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } if UserDefaults.int(forKey: .userId) == 17958 { Text("원") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } } @@ -74,7 +74,7 @@ struct ContentOrderDialogView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 5.3) { Text("소장") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.white) Text("(서비스 종료시까지)") @@ -93,17 +93,17 @@ struct ContentOrderDialogView: View { if UserDefaults.int(forKey: .userId) == 17958 { Text("\(price * 110)") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } else { Text("\(price)") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } if UserDefaults.int(forKey: .userId) == 17958 { Text("원") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } } diff --git a/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift b/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift index 7e7febd..7b3d896 100644 --- a/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift +++ b/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift @@ -44,7 +44,7 @@ struct LiveRoomDonationDialogView: View { .frame(width: 26.7, height: 26.7) Text("후원하기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -55,7 +55,7 @@ struct LiveRoomDonationDialogView: View { .frame(width: 26.7, height: 26.7) Text("\(can)") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) Text("충전") @@ -116,7 +116,7 @@ struct LiveRoomDonationDialogView: View { HStack(spacing: 0) { Text("+10") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(.white) .padding(.vertical, 12.7) .frame(width: 74) @@ -134,7 +134,7 @@ struct LiveRoomDonationDialogView: View { Spacer() Text("+100") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(.white) .padding(.vertical, 12.7) .frame(width: 74) @@ -150,7 +150,7 @@ struct LiveRoomDonationDialogView: View { Spacer() Text("+1,000") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(.white) .padding(.vertical, 12.7) .frame(width: 74) @@ -168,7 +168,7 @@ struct LiveRoomDonationDialogView: View { Spacer() Text("+10,000") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(.white) .padding(.vertical, 12.7) .frame(width: 74) @@ -218,7 +218,7 @@ struct LiveRoomDonationDialogView: View { HStack(spacing: 13.3) { Text("취소") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color.button) .padding(.vertical, 16) .frame(width: (screenSize().width - 53.3) / 3) @@ -234,7 +234,7 @@ struct LiveRoomDonationDialogView: View { } Text("후원하기") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(.white) .padding(.vertical, 16) .frame(width: (screenSize().width - 53.3) * 2 / 3) diff --git a/SodaLive/Sources/Content/Main/ContentMainView.swift b/SodaLive/Sources/Content/Main/ContentMainView.swift index 2c509d1..4656e09 100644 --- a/SodaLive/Sources/Content/Main/ContentMainView.swift +++ b/SodaLive/Sources/Content/Main/ContentMainView.swift @@ -19,7 +19,7 @@ struct ContentMainView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 0) { Text("콘텐츠 마켓") - .font(.custom(Font.bold.rawValue, size: 21.3)) + .appFont(size: 21.3, weight: .bold) .foregroundColor(Color.button) Spacer() @@ -82,7 +82,7 @@ struct ContentMainView: View { Image("ic_alarm_clock_blue") Text("보이스 모닝콜") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "0057ff")) } .cornerRadius(2.6) @@ -104,7 +104,7 @@ struct ContentMainView: View { Image("ic_short_play") Text("숏플") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "dd158d")) } .cornerRadius(2.6) @@ -161,7 +161,7 @@ struct ContentMainView: View { .frame(width: 20, height: 20) Text("콘텐츠 업로드") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.white) } .padding(13.3) diff --git a/SodaLive/Sources/Content/Main/Curation/ContentMainCurationItemView.swift b/SodaLive/Sources/Content/Main/Curation/ContentMainCurationItemView.swift index 2b8cedc..b21d72c 100644 --- a/SodaLive/Sources/Content/Main/Curation/ContentMainCurationItemView.swift +++ b/SodaLive/Sources/Content/Main/Curation/ContentMainCurationItemView.swift @@ -15,7 +15,7 @@ struct ContentMainCurationItemView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 0) { Text(item.title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentView.swift b/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentView.swift index 89b4d2d..f53ffba 100644 --- a/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentView.swift +++ b/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentView.swift @@ -15,7 +15,7 @@ struct ContentMainNewContentView: View { LazyVStack(spacing: 16.7) { HStack(spacing: 0) { Text("새로운 콘텐츠") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/Content/Main/Order/ContentMainMyStashView.swift b/SodaLive/Sources/Content/Main/Order/ContentMainMyStashView.swift index 919e068..fa14447 100644 --- a/SodaLive/Sources/Content/Main/Order/ContentMainMyStashView.swift +++ b/SodaLive/Sources/Content/Main/Order/ContentMainMyStashView.swift @@ -17,7 +17,7 @@ struct ContentMainMyStashView: View { VStack(alignment: .leading, spacing: 13.3) { HStack(spacing: 0) { Text("내 보관함") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/Content/Main/Ranking/ContentMainCreatorRankingView.swift b/SodaLive/Sources/Content/Main/Ranking/ContentMainCreatorRankingView.swift index 84ececc..6ed01ab 100644 --- a/SodaLive/Sources/Content/Main/Ranking/ContentMainCreatorRankingView.swift +++ b/SodaLive/Sources/Content/Main/Ranking/ContentMainCreatorRankingView.swift @@ -29,29 +29,29 @@ struct ContentMainCreatorRankingView: View { let titleArray = response.title.components(separatedBy: coloredTitle) HStack(spacing: 0) { Text(titleArray[0]) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) Text(coloredTitle) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: color)) if titleArray.count > 1 { Text(titleArray[1]) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) } } } else { Text(response.title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) } if let desc = response.desc { VStack(spacing: 8) { Text("\(desc)") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) Text("※ 인기 크리에이터의 순위는 매주 업데이트됩니다.") diff --git a/SodaLive/Sources/Content/Main/Ranking/ContentMainRankingView.swift b/SodaLive/Sources/Content/Main/Ranking/ContentMainRankingView.swift index 1a51995..8323d9f 100644 --- a/SodaLive/Sources/Content/Main/Ranking/ContentMainRankingView.swift +++ b/SodaLive/Sources/Content/Main/Ranking/ContentMainRankingView.swift @@ -22,7 +22,7 @@ struct ContentMainRankingView: View { LazyVStack(spacing: 16.7) { HStack(spacing: 0) { Text("인기 콘텐츠") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -35,7 +35,7 @@ struct ContentMainRankingView: View { VStack(spacing: 8) { Text("\(viewModel.dateString)") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.") @@ -72,7 +72,7 @@ struct ContentMainRankingView: View { .cornerRadius(2.7) Text("\(index + 1)") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "3bb9f1")) .padding(.horizontal, 12) diff --git a/SodaLive/Sources/Content/Main/RecommendSeries/ContentMainRecommendSeriesView.swift b/SodaLive/Sources/Content/Main/RecommendSeries/ContentMainRecommendSeriesView.swift index 90ba697..99e4e06 100644 --- a/SodaLive/Sources/Content/Main/RecommendSeries/ContentMainRecommendSeriesView.swift +++ b/SodaLive/Sources/Content/Main/RecommendSeries/ContentMainRecommendSeriesView.swift @@ -16,7 +16,7 @@ struct ContentMainRecommendSeriesView: View { if !viewModel.seriesList.isEmpty { VStack(alignment: .leading, spacing: 13.3) { Text("추천 시리즈") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) ScrollView(.horizontal, showsIndicators: false) { diff --git a/SodaLive/Sources/Content/Main/V2/Content/ContentMainTabRankContentView.swift b/SodaLive/Sources/Content/Main/V2/Content/ContentMainTabRankContentView.swift index 608504f..fa065d6 100644 --- a/SodaLive/Sources/Content/Main/V2/Content/ContentMainTabRankContentView.swift +++ b/SodaLive/Sources/Content/Main/V2/Content/ContentMainTabRankContentView.swift @@ -35,7 +35,7 @@ struct ContentMainTabRankContentView: View { VStack(spacing: 13.3) { HStack(spacing: 0) { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -76,7 +76,7 @@ struct ContentMainTabRankContentView: View { .cornerRadius(2.7) Text("\(index + 1)") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(.button) .padding(.horizontal, 12) diff --git a/SodaLive/Sources/Content/Main/V2/Content/ContentMainTagCurationView.swift b/SodaLive/Sources/Content/Main/V2/Content/ContentMainTagCurationView.swift index 058ea7e..01e3590 100644 --- a/SodaLive/Sources/Content/Main/V2/Content/ContentMainTagCurationView.swift +++ b/SodaLive/Sources/Content/Main/V2/Content/ContentMainTagCurationView.swift @@ -32,7 +32,7 @@ struct ContentMainTagCurationView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text("태그별 추천 콘텐츠") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Main/V2/ContentByChannelView.swift b/SodaLive/Sources/Content/Main/V2/ContentByChannelView.swift index 55855e6..8a9b94d 100644 --- a/SodaLive/Sources/Content/Main/V2/ContentByChannelView.swift +++ b/SodaLive/Sources/Content/Main/V2/ContentByChannelView.swift @@ -27,7 +27,7 @@ struct ContentByChannelView: View { var body: some View { VStack(alignment: .leading, spacing: 20) { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Main/V2/ContentMainCurationViewV2.swift b/SodaLive/Sources/Content/Main/V2/ContentMainCurationViewV2.swift index 25d1614..785704b 100644 --- a/SodaLive/Sources/Content/Main/V2/ContentMainCurationViewV2.swift +++ b/SodaLive/Sources/Content/Main/V2/ContentMainCurationViewV2.swift @@ -27,7 +27,7 @@ struct ContentMainCurationItemViewV2: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text(curation.title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Main/V2/ContentMainNewContentViewV2.swift b/SodaLive/Sources/Content/Main/V2/ContentMainNewContentViewV2.swift index b0e44e4..7fe8cbb 100644 --- a/SodaLive/Sources/Content/Main/V2/ContentMainNewContentViewV2.swift +++ b/SodaLive/Sources/Content/Main/V2/ContentMainNewContentViewV2.swift @@ -21,7 +21,7 @@ struct ContentMainNewContentViewV2: View { LazyVStack(spacing: 13.3) { HStack(spacing: 0) { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) Spacer() diff --git a/SodaLive/Sources/Content/Main/V2/ContentMainViewV2.swift b/SodaLive/Sources/Content/Main/V2/ContentMainViewV2.swift index 8d5c7bd..409e0ac 100644 --- a/SodaLive/Sources/Content/Main/V2/ContentMainViewV2.swift +++ b/SodaLive/Sources/Content/Main/V2/ContentMainViewV2.swift @@ -53,7 +53,7 @@ struct ContentMainViewV2: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("콘텐츠 마켓") - .font(.custom(Font.bold.rawValue, size: 21.3)) + .appFont(size: 21.3, weight: .bold) .foregroundColor(Color.button) Spacer() diff --git a/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeView.swift b/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeView.swift index 576a71a..e475a03 100644 --- a/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeView.swift +++ b/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeView.swift @@ -20,7 +20,7 @@ struct ContentMainTabHomeView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 0) { Text("보이스온") - .font(.custom(Font.bold.rawValue, size: 21.3)) + .appFont(size: 21.3, weight: .bold) .foregroundColor(Color.white) .padding(.leading, 8) @@ -278,7 +278,7 @@ struct ContentMainTabHomeView: View { .frame(width: 20, height: 20) Text("콘텐츠 업로드") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.white) } .padding(13.3) diff --git a/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift b/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift index 098ac68..38ffc2f 100644 --- a/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift +++ b/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift @@ -27,7 +27,7 @@ struct ContentMainTabHomeRankCreatorView: View { if let desc = response.desc, !token.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { VStack(spacing: 8) { Text("\(desc)") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) Text("※ 인기 순위는 매주 업데이트됩니다.") @@ -43,23 +43,23 @@ struct ContentMainTabHomeRankCreatorView: View { let titleArray = response.title.components(separatedBy: coloredTitle) HStack(spacing: 0) { Text(titleArray[0]) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) Text(coloredTitle) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: color)) if titleArray.count > 1 { Text(titleArray[1]) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) } } .padding(.top, token.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? 0 : 30) } else { Text(response.title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) .padding(.top, 30) } diff --git a/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankSeriesView.swift b/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankSeriesView.swift index 22c22b4..7233351 100644 --- a/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankSeriesView.swift +++ b/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankSeriesView.swift @@ -14,7 +14,7 @@ struct ContentMainTabHomeRankSeriesView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text("인기 시리즈") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) ScrollView(.horizontal, showsIndicators: false) { diff --git a/SodaLive/Sources/Content/Main/V2/Series/ContentMainCompletedSeriesView.swift b/SodaLive/Sources/Content/Main/V2/Series/ContentMainCompletedSeriesView.swift index 1fc3e39..9e32940 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/ContentMainCompletedSeriesView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/ContentMainCompletedSeriesView.swift @@ -16,7 +16,7 @@ struct ContentMainCompletedSeriesView: View { VStack(spacing: 13.3) { HStack(spacing: 0) { Text("완결 시리즈") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) Spacer() diff --git a/SodaLive/Sources/Content/Main/V2/Series/ContentMainNewOrRecommendSeriesView.swift b/SodaLive/Sources/Content/Main/V2/Series/ContentMainNewOrRecommendSeriesView.swift index ae7a282..4e8886c 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/ContentMainNewOrRecommendSeriesView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/ContentMainNewOrRecommendSeriesView.swift @@ -16,7 +16,7 @@ struct ContentMainNewOrRecommendSeriesView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesByGenreView.swift b/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesByGenreView.swift index f2066e4..50ec153 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesByGenreView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesByGenreView.swift @@ -18,7 +18,7 @@ struct ContentMainSeriesByGenreView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text("장르별 추천 시리즈") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesCurationView.swift b/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesCurationView.swift index 6dbe4b5..faa846c 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesCurationView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesCurationView.swift @@ -28,7 +28,7 @@ struct ContentMainSeriesCurationItemView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text(curation.title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesRankingView.swift b/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesRankingView.swift index e4a57cf..93c89e0 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesRankingView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesRankingView.swift @@ -21,7 +21,7 @@ struct ContentMainSeriesRankingView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text("일간 랭킹") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) .padding(.horizontal, 13.3) @@ -43,7 +43,7 @@ struct ContentMainSeriesRankingView: View { .cornerRadius(2.7) Text("\(index + 1)") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(.button) .padding(.horizontal, 12) diff --git a/SodaLive/Sources/Content/Main/V2/Series/OriginalAudioDrama/ContentMainOriginalAudioDramaView.swift b/SodaLive/Sources/Content/Main/V2/Series/OriginalAudioDrama/ContentMainOriginalAudioDramaView.swift index f0e744c..9590ec8 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/OriginalAudioDrama/ContentMainOriginalAudioDramaView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/OriginalAudioDrama/ContentMainOriginalAudioDramaView.swift @@ -16,7 +16,7 @@ struct ContentMainOriginalAudioDramaView: View { VStack(spacing: 13.3) { HStack(spacing: 0) { Text("오리지널 오디오 드라마") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) Spacer() diff --git a/SodaLive/Sources/Content/Main/V2/Series/SeriesByChannelView.swift b/SodaLive/Sources/Content/Main/V2/Series/SeriesByChannelView.swift index 4172f81..9ac1931 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/SeriesByChannelView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/SeriesByChannelView.swift @@ -19,7 +19,7 @@ struct SeriesByChannelView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Modify/ContentModifyView.swift b/SodaLive/Sources/Content/Modify/ContentModifyView.swift index a9f2571..be714f8 100644 --- a/SodaLive/Sources/Content/Modify/ContentModifyView.swift +++ b/SodaLive/Sources/Content/Modify/ContentModifyView.swift @@ -26,7 +26,7 @@ struct ContentModifyView: View { ScrollView(.vertical, showsIndicators: false) { VStack(spacing: 0) { Text("썸네일") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame(maxWidth: .infinity, alignment: .leading) @@ -83,7 +83,7 @@ struct ContentModifyView: View { VStack(spacing: 0) { Text("제목") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame(maxWidth: .infinity, alignment: .leading) @@ -101,7 +101,7 @@ struct ContentModifyView: View { HStack(spacing: 0) { Text("내용") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -126,7 +126,7 @@ struct ContentModifyView: View { .padding(.top, 13.3) Text("태그") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 26.7) @@ -153,7 +153,7 @@ struct ContentModifyView: View { VStack(spacing: 13.3) { Text("포인트 사용") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -177,7 +177,7 @@ struct ContentModifyView: View { if viewModel.isAdultShowUi { VStack(spacing: 13.3) { Text("연령 제한") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame(maxWidth: .infinity, alignment: .leading) @@ -207,7 +207,7 @@ struct ContentModifyView: 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(maxWidth: .infinity, alignment: .leading) @@ -231,7 +231,7 @@ struct ContentModifyView: View { VStack(spacing: 0) { HStack(alignment: .top, spacing: 0) { Text("수정") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.white) .frame(height: 50) .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Content/Playlist/ContentPlaylistItemView.swift b/SodaLive/Sources/Content/Playlist/ContentPlaylistItemView.swift index 36f3028..6d33e64 100644 --- a/SodaLive/Sources/Content/Playlist/ContentPlaylistItemView.swift +++ b/SodaLive/Sources/Content/Playlist/ContentPlaylistItemView.swift @@ -26,7 +26,7 @@ struct ContentPlaylistItemView: View { VStack(alignment: .leading, spacing: 7) { Text(item.title) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayd2) .lineLimit(1) diff --git a/SodaLive/Sources/Content/Playlist/ContentPlaylistListView.swift b/SodaLive/Sources/Content/Playlist/ContentPlaylistListView.swift index 2009265..6c9d2ec 100644 --- a/SodaLive/Sources/Content/Playlist/ContentPlaylistListView.swift +++ b/SodaLive/Sources/Content/Playlist/ContentPlaylistListView.swift @@ -18,7 +18,7 @@ struct ContentPlaylistListView: View { BaseView(isLoading: $viewModel.isLoading) { VStack(spacing: 13.3) { Text("+ 새 재생목록 만들기") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 13.3) .frame(maxWidth: .infinity) @@ -32,7 +32,7 @@ struct ContentPlaylistListView: View { if viewModel.playlists.isEmpty { VStack(spacing: 13.3) { Text("재생목록이 비어있습니다.") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) Text("자주 듣는 콘텐츠를\n재생목록으로 만들어 보세요.") diff --git a/SodaLive/Sources/Content/Playlist/Create/ContentPlaylistCreateView.swift b/SodaLive/Sources/Content/Playlist/Create/ContentPlaylistCreateView.swift index 1a5ec0a..cd56641 100644 --- a/SodaLive/Sources/Content/Playlist/Create/ContentPlaylistCreateView.swift +++ b/SodaLive/Sources/Content/Playlist/Create/ContentPlaylistCreateView.swift @@ -27,7 +27,7 @@ struct ContentPlaylistCreateView: View { .frame(width: 20, height: 20) Text("새 재생목록 만들기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) } @@ -51,7 +51,7 @@ struct ContentPlaylistCreateView: View { HStack(spacing: 0) { Text("재생목록 제목") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -71,7 +71,7 @@ struct ContentPlaylistCreateView: View { TextField("", text: $viewModel.title) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) .keyboardType(.webSearch) .frame(maxWidth: .infinity) @@ -84,7 +84,7 @@ struct ContentPlaylistCreateView: View { HStack(spacing: 0) { Text("재생목록 설명을 입력해 주세요") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -104,7 +104,7 @@ struct ContentPlaylistCreateView: View { TextField("", text: $viewModel.desc) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) .keyboardType(.webSearch) .frame(maxWidth: .infinity) @@ -119,7 +119,7 @@ struct ContentPlaylistCreateView: View { Image("btn_plus_round") Text("새로운 콘텐츠 추가/제거") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.button) } .padding(.top, 26.7) diff --git a/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift b/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift index f516ddb..21816b0 100644 --- a/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift +++ b/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift @@ -18,7 +18,7 @@ struct PlaylistAddContentView: View { VStack(alignment: .leading, spacing: 13.3) { ZStack { Text("새로운 콘텐츠 추가/제거") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) HStack(spacing: 0) { diff --git a/SodaLive/Sources/Content/Playlist/Detail/ContentPlaylistDetailView.swift b/SodaLive/Sources/Content/Playlist/Detail/ContentPlaylistDetailView.swift index a5f588b..bdb5759 100644 --- a/SodaLive/Sources/Content/Playlist/Detail/ContentPlaylistDetailView.swift +++ b/SodaLive/Sources/Content/Playlist/Detail/ContentPlaylistDetailView.swift @@ -112,7 +112,7 @@ struct ContentPlaylistDetailView: View { VStack(alignment: .leading, spacing: 6.7) { Text(response.title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayd2) .lineLimit(2) .truncationMode(.tail) @@ -142,7 +142,7 @@ struct ContentPlaylistDetailView: View { Image("ic_playlist_play") Text("Play") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.white) } .frame(maxWidth: .infinity) @@ -160,7 +160,7 @@ struct ContentPlaylistDetailView: View { Image("ic_playlist_shuffle") Text("Shuffle") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.white) } .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Content/Playlist/Modify/ContentPlaylistModifyView.swift b/SodaLive/Sources/Content/Playlist/Modify/ContentPlaylistModifyView.swift index 62d1949..98600dc 100644 --- a/SodaLive/Sources/Content/Playlist/Modify/ContentPlaylistModifyView.swift +++ b/SodaLive/Sources/Content/Playlist/Modify/ContentPlaylistModifyView.swift @@ -28,7 +28,7 @@ struct ContentPlaylistModifyView: View { .frame(width: 20, height: 20) Text("재생목록 수정") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) } @@ -52,7 +52,7 @@ struct ContentPlaylistModifyView: View { HStack(spacing: 0) { Text("재생목록 제목") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -72,7 +72,7 @@ struct ContentPlaylistModifyView: View { TextField("", text: $viewModel.title) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) .keyboardType(.webSearch) .frame(maxWidth: .infinity) @@ -85,7 +85,7 @@ struct ContentPlaylistModifyView: View { HStack(spacing: 0) { Text("재생목록 설명을 입력해 주세요") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -105,7 +105,7 @@ struct ContentPlaylistModifyView: View { TextField("", text: $viewModel.desc) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) .keyboardType(.webSearch) .frame(maxWidth: .infinity) @@ -120,7 +120,7 @@ struct ContentPlaylistModifyView: View { Image("btn_plus_round") Text("새로운 콘텐츠 추가/제거") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.button) } .padding(.top, 26.7) diff --git a/SodaLive/Sources/Content/Series/DayOfWeekSeriesView.swift b/SodaLive/Sources/Content/Series/DayOfWeekSeriesView.swift index e3afaa2..1af2077 100644 --- a/SodaLive/Sources/Content/Series/DayOfWeekSeriesView.swift +++ b/SodaLive/Sources/Content/Series/DayOfWeekSeriesView.swift @@ -46,7 +46,7 @@ struct DayOfWeekSeriesView: View { VStack(alignment: .leading, spacing: 16) { HStack(spacing: 0) { Text("요일별 시리즈") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Content/Series/Detail/SeriesDetailHomeView.swift b/SodaLive/Sources/Content/Series/Detail/SeriesDetailHomeView.swift index a87bae3..1ae018e 100644 --- a/SodaLive/Sources/Content/Series/Detail/SeriesDetailHomeView.swift +++ b/SodaLive/Sources/Content/Series/Detail/SeriesDetailHomeView.swift @@ -18,7 +18,7 @@ struct SeriesDetailHomeView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("전체회차 듣기") - .font(.custom(Font.bold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.button) Text(" (\(contentCount))") diff --git a/SodaLive/Sources/Content/Series/Detail/SeriesDetailIntroductionView.swift b/SodaLive/Sources/Content/Series/Detail/SeriesDetailIntroductionView.swift index 6f3974c..7d27c97 100644 --- a/SodaLive/Sources/Content/Series/Detail/SeriesDetailIntroductionView.swift +++ b/SodaLive/Sources/Content/Series/Detail/SeriesDetailIntroductionView.swift @@ -16,7 +16,7 @@ struct SeriesDetailIntroductionView: View { var body: some View { VStack(alignment: .leading, spacing: 16) { Text(I18n.SeriesDetail.keywords) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) .padding(.top, 16) .padding(.horizontal, 13.3) @@ -32,7 +32,7 @@ struct SeriesDetailIntroductionView: View { VStack(alignment: .leading, spacing: 13.3) { Text(I18n.SeriesDetail.workIntro) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) Text(seriesDetail.displayIntroduction) @@ -48,7 +48,7 @@ struct SeriesDetailIntroductionView: View { VStack(alignment: .leading, spacing: 16) { Text(I18n.SeriesDetail.details) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) HStack(spacing: 30) { @@ -117,7 +117,7 @@ struct SeriesDetailIntroductionView: View { VStack(alignment: .leading, spacing: 13.3) { Text(I18n.SeriesDetail.price) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) HStack(spacing: 30) { diff --git a/SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift b/SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift index e476737..5bc299b 100644 --- a/SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift +++ b/SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift @@ -77,7 +77,7 @@ struct SeriesDetailView: View { VStack(alignment: .leading, spacing: 0) { Text(seriesDetail.displayTitle) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) .padding(.horizontal, 13.3) .padding(.top, 24) diff --git a/SodaLive/Sources/Content/Series/Main/Home/SeriesMainHomeView.swift b/SodaLive/Sources/Content/Series/Main/Home/SeriesMainHomeView.swift index fc265a8..6e55c02 100644 --- a/SodaLive/Sources/Content/Series/Main/Home/SeriesMainHomeView.swift +++ b/SodaLive/Sources/Content/Series/Main/Home/SeriesMainHomeView.swift @@ -24,7 +24,7 @@ struct SeriesMainHomeView: View { VStack(alignment: .leading, spacing: 16) { HStack(spacing: 0) { Text("완결 시리즈") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() @@ -59,7 +59,7 @@ struct SeriesMainHomeView: View { VStack(alignment: .leading, spacing: 16) { HStack(spacing: 0) { Text("추천 시리즈") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Dialog/ApplyAuditionCompleteDialog.swift b/SodaLive/Sources/Dialog/ApplyAuditionCompleteDialog.swift index c07ab07..6f2bcea 100644 --- a/SodaLive/Sources/Dialog/ApplyAuditionCompleteDialog.swift +++ b/SodaLive/Sources/Dialog/ApplyAuditionCompleteDialog.swift @@ -21,7 +21,7 @@ struct ApplyAuditionCompleteDialog: View { VStack(spacing: 0) { Text("오디션 지원") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) .padding(.top, 26.7) @@ -31,7 +31,7 @@ struct ApplyAuditionCompleteDialog: View { .padding(.top, 15) Text(auditionTitle) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.graybb) .padding(.top, 20) @@ -41,7 +41,7 @@ struct ApplyAuditionCompleteDialog: View { .padding(.top, 10) Text("확인") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 16) .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Dialog/CommunityPostPurchaseDialog.swift b/SodaLive/Sources/Dialog/CommunityPostPurchaseDialog.swift index 57a25d2..5e915a7 100644 --- a/SodaLive/Sources/Dialog/CommunityPostPurchaseDialog.swift +++ b/SodaLive/Sources/Dialog/CommunityPostPurchaseDialog.swift @@ -23,7 +23,7 @@ struct CommunityPostPurchaseDialog: View { VStack(spacing: 0) { Text("게시글 보기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.graybb) .padding(.top, 40) @@ -36,7 +36,7 @@ struct CommunityPostPurchaseDialog: 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: (geo.size.width - 66.7) / 3) @@ -51,7 +51,7 @@ struct CommunityPostPurchaseDialog: View { } Text("\(can)캔으로 보기") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 16) .frame(width: (geo.size.width - 66.7) * 2 / 3) diff --git a/SodaLive/Sources/Dialog/CreatorFollowNotifyDialog.swift b/SodaLive/Sources/Dialog/CreatorFollowNotifyDialog.swift index 3f2cb94..925dcdb 100644 --- a/SodaLive/Sources/Dialog/CreatorFollowNotifyDialog.swift +++ b/SodaLive/Sources/Dialog/CreatorFollowNotifyDialog.swift @@ -29,7 +29,7 @@ struct CreatorFollowNotifyDialog: View { if isShow { VStack(alignment: .leading, spacing: 24) { Text("알림") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) CreatorFollowNotifyItem( diff --git a/SodaLive/Sources/Dialog/LivePaymentDialog.swift b/SodaLive/Sources/Dialog/LivePaymentDialog.swift index 1ed01e6..3dcfcf3 100644 --- a/SodaLive/Sources/Dialog/LivePaymentDialog.swift +++ b/SodaLive/Sources/Dialog/LivePaymentDialog.swift @@ -23,7 +23,7 @@ struct LivePaymentDialog: View { var body: some View { VStack { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.graybb) Text(desc) @@ -71,7 +71,7 @@ struct LivePaymentDialog: 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) @@ -84,7 +84,7 @@ struct LivePaymentDialog: View { .onTapGesture { cancelButtonAction() } Text("결제 후 입장") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .padding(.vertical, 16) .frame(maxWidth: .infinity) .background(Color.button) diff --git a/SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift b/SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift index e9e5d7d..86bc819 100644 --- a/SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift +++ b/SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift @@ -26,7 +26,7 @@ struct LiveRoomPasswordDialog: 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) @@ -49,7 +49,7 @@ struct LiveRoomPasswordDialog: View { HStack(spacing: 13.3) { Text("취소") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "3bb9f1")) .padding(.vertical, 16) .frame(width: (geo.size.width - 66.7) / 3) @@ -66,7 +66,7 @@ struct LiveRoomPasswordDialog: View { if can > 0 { HStack(spacing: 0) { Text("\(can)") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "ffffff")) Image("ic_can") @@ -74,7 +74,7 @@ struct LiveRoomPasswordDialog: View { .frame(width: 20, height: 20) Text("으로 입장") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "ffffff")) } .padding(.vertical, 16) @@ -91,7 +91,7 @@ struct LiveRoomPasswordDialog: View { } } else { Text("입장하기") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "ffffff")) .padding(.vertical, 16) .frame(width: (geo.size.width - 66.7) * 2 / 3) diff --git a/SodaLive/Sources/Dialog/MemberProfileDialog.swift b/SodaLive/Sources/Dialog/MemberProfileDialog.swift index 3c89baf..c67c93a 100644 --- a/SodaLive/Sources/Dialog/MemberProfileDialog.swift +++ b/SodaLive/Sources/Dialog/MemberProfileDialog.swift @@ -26,7 +26,7 @@ struct MemberProfileDialog: View { VStack(alignment: .leading, spacing: 21) { HStack(spacing: 0) { Text("프로필") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -39,7 +39,7 @@ struct MemberProfileDialog: View { if let profile = viewModel.memberProfile { Text(profile.nickname) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) KFImage(URL(string: profile.profileImageUrl)) @@ -57,7 +57,7 @@ struct MemberProfileDialog: View { HStack(spacing: 8) { Text(profile.isBlocked ? "차단 해제" : "차단") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color.button) .frame(maxWidth: .infinity) .padding(.vertical, 13) @@ -77,7 +77,7 @@ struct MemberProfileDialog: View { } Text("사용자 신고") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color.button) .frame(maxWidth: .infinity) .padding(.vertical, 13) @@ -91,7 +91,7 @@ struct MemberProfileDialog: View { .onTapGesture { viewModel.isShowUesrReportView = true } Text("프로필 신고") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color.button) .frame(maxWidth: .infinity) .padding(.vertical, 13) diff --git a/SodaLive/Sources/Dialog/SodaDialog.swift b/SodaLive/Sources/Dialog/SodaDialog.swift index af20640..5431fa5 100644 --- a/SodaLive/Sources/Dialog/SodaDialog.swift +++ b/SodaLive/Sources/Dialog/SodaDialog.swift @@ -44,7 +44,7 @@ struct SodaDialog: View { VStack(spacing: 0) { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.graybb) .padding(.top, 40) @@ -59,7 +59,7 @@ struct SodaDialog: View { HStack(spacing: 13.3) { if cancelButtonTitle.count > 0 { Text(cancelButtonTitle) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color.button) .padding(.vertical, 16) .frame(width: (geo.size.width - 66.7) / 3) @@ -75,7 +75,7 @@ struct SodaDialog: View { } Text(confirmButtonTitle) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 16) .frame(width: (geo.size.width - 66.7) * 2 / 3) diff --git a/SodaLive/Sources/Explorer/ExplorerSectionView.swift b/SodaLive/Sources/Explorer/ExplorerSectionView.swift index 297a7a2..abfeff3 100644 --- a/SodaLive/Sources/Explorer/ExplorerSectionView.swift +++ b/SodaLive/Sources/Explorer/ExplorerSectionView.swift @@ -26,29 +26,29 @@ struct ExplorerSectionView: View { let titleArray = section.title.components(separatedBy: coloredTitle) HStack(spacing: 0) { Text(titleArray[0]) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text(coloredTitle) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: color)) if titleArray.count > 1 { Text(titleArray[1]) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } } } else { Text(section.title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } if let desc = section.desc { VStack(spacing: 8) { Text("\(desc)") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text("※ 인기 크리에이터의 순위는 매주 업데이트됩니다.") diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemLockView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemLockView.swift index de8e7a7..1b2c8c2 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemLockView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemLockView.swift @@ -17,7 +17,7 @@ struct CreatorCommunityAllItemLockView: View { Image("ic_lock_bb") Text("\(price)캔으로 게시글 보기") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color.button) .padding(.horizontal, 21) .padding(.vertical, 11) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityItemView.swift index 8abc106..f1da68b 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityItemView.swift @@ -23,7 +23,7 @@ struct CreatorCommunityItemView: View { VStack(alignment: .leading, spacing: 0) { Text(item.creatorNickname) - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(Color.white) Text(item.relativeTimeText()) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityNoPostsItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityNoPostsItemView.swift index a3d068d..603fbc0 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityNoPostsItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityNoPostsItemView.swift @@ -16,7 +16,7 @@ struct CreatorCommunityNoPostsItemView: View { CreatorCommunityWriteItemView() Text("게시물 등록") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text("게시 후에 게시물이 여기에 표시되고\n커뮤니티에 공개됩니다.") diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Modify/CreatorCommunityModifyView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Modify/CreatorCommunityModifyView.swift index b2dd284..838ae40 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Modify/CreatorCommunityModifyView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Modify/CreatorCommunityModifyView.swift @@ -30,7 +30,7 @@ struct CreatorCommunityModifyView: View { VStack(spacing: 0) { VStack(spacing: 13.3) { Text("이미지") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame(maxWidth: .infinity, alignment: .leading) @@ -103,7 +103,7 @@ struct CreatorCommunityModifyView: View { HStack(spacing: 0) { Text("내용") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -129,7 +129,7 @@ struct CreatorCommunityModifyView: 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(maxWidth: .infinity, alignment: .leading) @@ -157,7 +157,7 @@ struct CreatorCommunityModifyView: 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(maxWidth: .infinity, alignment: .leading) @@ -188,7 +188,7 @@ struct CreatorCommunityModifyView: View { VStack(spacing: 0) { HStack(spacing: 13.3) { Text("닫기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "3BB9F1")) .frame(maxWidth: .infinity) .frame(height: 50) @@ -204,7 +204,7 @@ struct CreatorCommunityModifyView: View { } Text("수정") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.white) .frame(maxWidth: .infinity) .frame(height: 50) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityRecordingVoiceView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityRecordingVoiceView.swift index d28ad10..d0a949b 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityRecordingVoiceView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityRecordingVoiceView.swift @@ -32,7 +32,7 @@ struct CreatorCommunityRecordingVoiceView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("음성녹음") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) Spacer() @@ -47,7 +47,7 @@ struct CreatorCommunityRecordingVoiceView: View { } Text(soundManager.timeString) - .font(.custom(Font.bold.rawValue, size: 33.3)) + .appFont(size: 33.3, weight: .bold) .foregroundColor(.white) .padding(.top, 80) @@ -115,7 +115,7 @@ struct CreatorCommunityRecordingVoiceView: View { HStack(spacing: 13.3) { Text("다시 녹음") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.button) .frame(width: (proxy.size.width - 40) / 3, height: 50) .background(Color.button.opacity(0.2)) @@ -131,7 +131,7 @@ struct CreatorCommunityRecordingVoiceView: View { } Text("녹음완료") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .frame(width: (proxy.size.width - 40) * 2 / 3, height: 50) .background(Color.button) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityWriteView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityWriteView.swift index 008ad68..a076763 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityWriteView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityWriteView.swift @@ -32,7 +32,7 @@ struct CreatorCommunityWriteView: View { VStack(spacing: 0) { VStack(spacing: 13.3) { Text("이미지") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -100,7 +100,7 @@ struct CreatorCommunityWriteView: 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() @@ -130,7 +130,7 @@ struct CreatorCommunityWriteView: View { HStack(spacing: 0) { Text("내용") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -156,7 +156,7 @@ struct CreatorCommunityWriteView: View { VStack(spacing: 13.3) { Text("댓글 가능 여부") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -185,7 +185,7 @@ struct CreatorCommunityWriteView: View { if UserDefaults.bool(forKey: .auth) { VStack(spacing: 13.3) { Text("연령 제한") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -215,7 +215,7 @@ struct CreatorCommunityWriteView: View { if let _ = viewModel.postImageData { VStack(spacing: 13.3) { Text("가격 설정") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) @@ -245,7 +245,7 @@ struct CreatorCommunityWriteView: 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) @@ -274,7 +274,7 @@ struct CreatorCommunityWriteView: View { VStack(spacing: 0) { HStack(spacing: 13.3) { Text("닫기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.button) .frame(maxWidth: .infinity) .frame(height: 50) @@ -290,7 +290,7 @@ struct CreatorCommunityWriteView: View { } Text("등록") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.white) .frame(maxWidth: .infinity) .frame(height: 50) diff --git a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkCheersItemView.swift b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkCheersItemView.swift index 6ce52a7..23c9dbe 100644 --- a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkCheersItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkCheersItemView.swift @@ -43,7 +43,7 @@ struct UserProfileFanTalkCheersItemView: View { VStack(alignment: .leading, spacing: 0) { Text("\(cheersItem.nickname)") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.white) Text("\(cheersItem.date)") @@ -70,7 +70,7 @@ struct UserProfileFanTalkCheersItemView: View { ) Text("수정") - .font(.custom(Font.preBold.rawValue, size: 14)) + .appFont(size: 14, weight: .bold) .foregroundColor(Color.white) .padding(13.3) .background(Color.button) @@ -81,7 +81,7 @@ struct UserProfileFanTalkCheersItemView: View { } Text("취소") - .font(.custom(Font.preBold.rawValue, size: 14)) + .appFont(size: 14, weight: .bold) .foregroundColor(Color.button) .padding(13.3) .background(Color.gray22) @@ -119,7 +119,7 @@ struct UserProfileFanTalkCheersItemView: View { ) Text("등록") - .font(.custom(Font.preBold.rawValue, size: 14)) + .appFont(size: 14, weight: .bold) .foregroundColor(Color.white) .padding(13.3) .background(Color.button) diff --git a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift index 7fb2d62..9880f3b 100644 --- a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift +++ b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift @@ -26,7 +26,7 @@ struct UserProfileFanTalkView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 0) { Text("팬 Talk") - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(Color.white) Spacer() diff --git a/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListView.swift b/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListView.swift index ff29630..efb5e64 100644 --- a/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListView.swift +++ b/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListView.swift @@ -26,7 +26,7 @@ struct FollowerListView: View { HStack(spacing: 4) { Text("전체") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.grayee) Text("\(viewModel.totalCount)") diff --git a/SodaLive/Sources/Explorer/Profile/Series/UserProfileSeriesView.swift b/SodaLive/Sources/Explorer/Profile/Series/UserProfileSeriesView.swift index 9b263f1..28d0fa1 100644 --- a/SodaLive/Sources/Explorer/Profile/Series/UserProfileSeriesView.swift +++ b/SodaLive/Sources/Explorer/Profile/Series/UserProfileSeriesView.swift @@ -16,7 +16,7 @@ struct UserProfileSeriesView: View { VStack(alignment: .leading, spacing: 13.3) { HStack(spacing: 0) { Text("시리즈") - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(Color.white) Spacer() diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileActivitySummaryView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileActivitySummaryView.swift index 1bdddfb..7b2d298 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileActivitySummaryView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileActivitySummaryView.swift @@ -59,7 +59,7 @@ struct UserProfileActivitySummaryView: View { .multilineTextAlignment(.center) Text(count) - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.grayee) } Spacer() diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift index 4340ef9..cd1dc65 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift @@ -25,7 +25,7 @@ struct UserProfileContentView: View { VStack(spacing: 21) { HStack(spacing: 0) { Text(userId == UserDefaults.int(forKey: .userId) ? "내 콘텐츠" : "콘텐츠") - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(Color.white) Spacer() @@ -40,7 +40,7 @@ struct UserProfileContentView: View { if userId == UserDefaults.int(forKey: .userId) { Text("새로운 콘텐츠 등록하기") - .font(.custom(Font.bold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.grayee) .padding(.vertical, 17) .frame(maxWidth: .infinity) @@ -74,7 +74,7 @@ struct UserProfileContentView: View { // 상단 정보 (계산된 % 보유중, 정보 아이콘, 개수) HStack { Text(ownedContentCount > 0 ? "\(Int(round(Double(ownedContentCount) / Double(totalContentCount) * 100)))% 보유중" : "소장 중인 작품이 없어요!") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift index ae9cf0c..4f5c17b 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift @@ -24,7 +24,7 @@ struct UserProfileDonationAllView: View { Spacer() Text("채널에 후원랭킹 활성화") - .font(.custom(Font.bold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Image(viewModel.isVisibleDonationRank ? "btn_toggle_on_big" : "btn_toggle_off_big") @@ -50,13 +50,13 @@ struct UserProfileDonationAllView: View { VStack(spacing: 13.3) { HStack(spacing: 0) { Text("오늘") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() Text("\(viewModel.accumulatedCansToday.comma())") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") @@ -66,13 +66,13 @@ struct UserProfileDonationAllView: View { HStack(spacing: 0) { Text("지난주") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() Text("\(viewModel.accumulatedCansLastWeek.comma())") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") @@ -82,13 +82,13 @@ struct UserProfileDonationAllView: View { HStack(spacing: 0) { Text("이번 달 어제까지") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() Text("\(viewModel.accumulatedCansThisMonth.comma())") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") @@ -218,7 +218,7 @@ struct UserProfileDonationAllItemView: 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) diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift index 67b151a..66908d8 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift @@ -24,7 +24,7 @@ struct UserProfileDonationView: View { VStack(alignment: .leading, spacing: 14) { HStack(spacing: 0) { Text("후원랭킹") - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(Color.white) Spacer() diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileIntroduceView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileIntroduceView.swift index fa59a09..ac289d0 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileIntroduceView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileIntroduceView.swift @@ -14,7 +14,7 @@ struct UserProfileIntroduceView: View { var body: some View { VStack(alignment: .leading, spacing: 16.7) { Text("채널 소개") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text(introduce) diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift index 0cec001..cbcdb11 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift @@ -76,7 +76,7 @@ struct UserProfileLiveView: View { VStack(alignment: .trailing, spacing: 8) { if item.isActive && !item.channelName.isNullOrBlank() { Text("ON\nAIR") - .font(.custom(Font.preBold.rawValue, size: 14)) + .appFont(size: 14, weight: .bold) .foregroundColor(Color.white) .frame(width: 52, height: 52) .background(Color(hex: "ff5c49")) @@ -84,7 +84,7 @@ struct UserProfileLiveView: View { } else { 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) @@ -92,7 +92,7 @@ struct UserProfileLiveView: 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) @@ -103,7 +103,7 @@ struct UserProfileLiveView: View { if item.isReservation { Text("예약완료") - .font(.custom(Font.preBold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color.white) .padding(4) .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileView.swift index 52e39e7..e2abfee 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileView.swift @@ -43,7 +43,7 @@ struct UserProfileView: View { VStack(alignment: .leading, spacing: 8) { HStack(spacing: 8) { Text(creatorProfile.creator.nickname) - .font(.custom(Font.preBold.rawValue, size: 32)) + .appFont(size: 32, weight: .bold) .foregroundColor(.white) if creatorProfile.creator.creatorId != UserDefaults.int(forKey: .userId) { @@ -65,7 +65,7 @@ struct UserProfileView: View { if creatorProfile.creator.creatorId == UserDefaults.int(forKey: .userId) { Text(I18n.MemberChannel.followersList) - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.black) .padding(.vertical, 8) .frame(maxWidth: .infinity) @@ -189,7 +189,7 @@ struct UserProfileView: View { VStack(alignment: .leading, spacing: 14) { HStack(spacing: 0) { Text(I18n.MemberChannel.liveHeader) - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(Color.white) Spacer() @@ -198,7 +198,7 @@ struct UserProfileView: View { if creatorProfile.creator.creatorId == UserDefaults.int(forKey: .userId) { HStack(spacing: 8) { Text(I18n.MemberChannel.rouletteSettings) - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.grayee) .padding(.vertical, 12) .frame(maxWidth: .infinity) @@ -207,7 +207,7 @@ struct UserProfileView: View { .onTapGesture { isShowRouletteSettings = true } Text(I18n.MemberChannel.menuSettings) - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.grayee) .padding(.vertical, 12) .frame(maxWidth: .infinity) @@ -259,7 +259,7 @@ struct UserProfileView: View { VStack(alignment: .leading, spacing: 14) { HStack(spacing: 0) { Text(I18n.MemberChannel.communityHeader) - .font(.custom(Font.preBold.rawValue, size: 26)) + .appFont(size: 26, weight: .bold) .foregroundColor(Color.white) .padding(.horizontal, 24) diff --git a/SodaLive/Sources/Follow/FollowCreatorItemView.swift b/SodaLive/Sources/Follow/FollowCreatorItemView.swift index 545106e..d1baffe 100644 --- a/SodaLive/Sources/Follow/FollowCreatorItemView.swift +++ b/SodaLive/Sources/Follow/FollowCreatorItemView.swift @@ -30,7 +30,7 @@ struct FollowCreatorItemView: View { .clipShape(Circle()) Text(creator.nickname) - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color.grayee) .padding(.leading, 13.3) diff --git a/SodaLive/Sources/Home/HomeLatestContentView.swift b/SodaLive/Sources/Home/HomeLatestContentView.swift index 12367f1..04e1e45 100644 --- a/SodaLive/Sources/Home/HomeLatestContentView.swift +++ b/SodaLive/Sources/Home/HomeLatestContentView.swift @@ -24,7 +24,7 @@ struct HomeLatestContentView: View { var body: some View { HStack(spacing: 0) { Text("최신 콘텐츠") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Home/HomeTabView.swift b/SodaLive/Sources/Home/HomeTabView.swift index 5ea457a..5bb1542 100644 --- a/SodaLive/Sources/Home/HomeTabView.swift +++ b/SodaLive/Sources/Home/HomeTabView.swift @@ -86,7 +86,7 @@ struct HomeTabView: View { if !viewModel.liveList.isEmpty { VStack(alignment: .leading, spacing: 16) { Text("지금 라이브중") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) .padding(.horizontal, 24) @@ -121,7 +121,7 @@ struct HomeTabView: View { if !viewModel.creatorRanking.isEmpty { VStack(alignment: .leading, spacing: 16) { Text("인기 크리에이터") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) .padding(.horizontal, 24) @@ -189,7 +189,7 @@ struct HomeTabView: View { VStack(alignment: .leading, spacing: 16) { HStack(spacing: 0) { Text("오직 보이스온에서만") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() @@ -258,7 +258,7 @@ struct HomeTabView: View { if !viewModel.recommendChannelList.isEmpty { VStack(alignment: .leading, spacing: 16) { Text("추천 채널") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) .padding(.horizontal, 24) @@ -277,7 +277,7 @@ struct HomeTabView: View { VStack(alignment: .leading, spacing: 16) { HStack(spacing: 0) { Text("무료 콘텐츠") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() @@ -307,7 +307,7 @@ struct HomeTabView: View { VStack(alignment: .leading, spacing: 16) { HStack(spacing: 0) { Text("포인트 대여 콘텐츠") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() @@ -337,7 +337,7 @@ struct HomeTabView: View { VStack(alignment: .leading, spacing: 16) { HStack { Text("추천 콘텐츠") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() @@ -403,7 +403,7 @@ struct HomeTabView: 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) diff --git a/SodaLive/Sources/Home/HomeWeeklyChartItemView.swift b/SodaLive/Sources/Home/HomeWeeklyChartItemView.swift index 3479696..fb7f23f 100644 --- a/SodaLive/Sources/Home/HomeWeeklyChartItemView.swift +++ b/SodaLive/Sources/Home/HomeWeeklyChartItemView.swift @@ -17,7 +17,7 @@ struct HomeWeeklyChartItemView: View { var body: some View { HStack(spacing: 16) { Text("\(rank)") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(Color(hex: "B5E7FA")) .frame(width: 30) diff --git a/SodaLive/Sources/Home/HomeWeeklyChartView.swift b/SodaLive/Sources/Home/HomeWeeklyChartView.swift index 0c2f7b7..1f7556b 100644 --- a/SodaLive/Sources/Home/HomeWeeklyChartView.swift +++ b/SodaLive/Sources/Home/HomeWeeklyChartView.swift @@ -32,7 +32,7 @@ struct HomeWeeklyChartView: View { VStack(spacing: 16) { HStack(spacing: 0) { Text("보온 주간 차트") - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Home/RecommendChannel/RecommendChannelItemView.swift b/SodaLive/Sources/Home/RecommendChannel/RecommendChannelItemView.swift index c71f110..e39ad0c 100644 --- a/SodaLive/Sources/Home/RecommendChannel/RecommendChannelItemView.swift +++ b/SodaLive/Sources/Home/RecommendChannel/RecommendChannelItemView.swift @@ -25,7 +25,7 @@ struct RecommendChannelItemView: View { VStack(alignment: .leading, spacing: 4) { Text(item.creatorNickname) - .font(.custom(Font.preBold.rawValue, size: 24)) + .appFont(size: 24, weight: .bold) .foregroundColor(.white) HStack(spacing: 4) { @@ -34,7 +34,7 @@ struct RecommendChannelItemView: View { .foregroundColor(.white) Text("\(item.contentCount)") - .font(.custom(Font.preBold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(.white) } } diff --git a/SodaLive/Sources/Live/Cancel/LiveCancelDialog.swift b/SodaLive/Sources/Live/Cancel/LiveCancelDialog.swift index 3211ac1..814c48c 100644 --- a/SodaLive/Sources/Live/Cancel/LiveCancelDialog.swift +++ b/SodaLive/Sources/Live/Cancel/LiveCancelDialog.swift @@ -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) diff --git a/SodaLive/Sources/Live/LiveReplayListView.swift b/SodaLive/Sources/Live/LiveReplayListView.swift index de2fdb7..cd5349f 100644 --- a/SodaLive/Sources/Live/LiveReplayListView.swift +++ b/SodaLive/Sources/Live/LiveReplayListView.swift @@ -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() diff --git a/SodaLive/Sources/Live/LiveView.swift b/SodaLive/Sources/Live/LiveView.swift index 482b98b..182bc9d 100644 --- a/SodaLive/Sources/Live/LiveView.swift +++ b/SodaLive/Sources/Live/LiveView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Now/SectionLiveNowView.swift b/SodaLive/Sources/Live/Now/SectionLiveNowView.swift index fb0c10a..2f6714d 100644 --- a/SodaLive/Sources/Live/Now/SectionLiveNowView.swift +++ b/SodaLive/Sources/Live/Now/SectionLiveNowView.swift @@ -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() diff --git a/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift b/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift index 81f804c..a1e70d3 100644 --- a/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift +++ b/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Reservation/All/WeekCalendarView.swift b/SodaLive/Sources/Live/Reservation/All/WeekCalendarView.swift index 14a7f42..109a7ef 100644 --- a/SodaLive/Sources/Live/Reservation/All/WeekCalendarView.swift +++ b/SodaLive/Sources/Live/Reservation/All/WeekCalendarView.swift @@ -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 : diff --git a/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift b/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift index e101fc1..8ab110f 100644 --- a/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift +++ b/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift b/SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift index e10ebd3..3618449 100644 --- a/SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift +++ b/SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Reservation/MyLiveReservationItemView.swift b/SodaLive/Sources/Live/Reservation/MyLiveReservationItemView.swift index fc7f859..0778076 100644 --- a/SodaLive/Sources/Live/Reservation/MyLiveReservationItemView.swift +++ b/SodaLive/Sources/Live/Reservation/MyLiveReservationItemView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift b/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift index f54e047..47167a7 100644 --- a/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift +++ b/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift @@ -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() diff --git a/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift b/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift index 45c0420..c9fbd5b 100644 --- a/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift +++ b/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift b/SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift index dad16c3..4c3cc20 100644 --- a/SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift +++ b/SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift b/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift index d6d0a6f..3444f7c 100644 --- a/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift +++ b/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift index 1016fa6..e883e53 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift @@ -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))") diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift index 4100f78..5202e10 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift @@ -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() diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift index cbc11dd..31d0615 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift index 272a4fc..16eff79 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift @@ -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 { diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift index 0bccbdf..fe22a99 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift @@ -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() diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift index 8578d8f..c2950a7 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift index 3e88f01..de1df37 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift @@ -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() diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift index 6d8f363..d9f7dba 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift index ce95bf9..9f110a6 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift index 1a3e163..49ecbc9 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift @@ -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() } diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift index e88e3a9..1411d9f 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift @@ -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)") diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift index 38dad73..1a5d30d 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift b/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift index fc872ea..c7b969b 100644 --- a/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift +++ b/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift b/SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift index 5061db9..7dc65af 100644 --- a/SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift +++ b/SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift @@ -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) { diff --git a/SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift b/SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift index 1afe132..5309e2c 100644 --- a/SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift +++ b/SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift index f4a3060..d9954ee 100644 --- a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift +++ b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift b/SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift index 26c45a6..fd71e79 100644 --- a/SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift +++ b/SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift index aad81c5..effab73 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift @@ -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) } diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift index 2981ccc..a67310f 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift @@ -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) diff --git a/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift b/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift index 03d77e0..fd5a9af 100644 --- a/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift +++ b/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift @@ -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) diff --git a/SodaLive/Sources/Live/SectionCommunityPostView.swift b/SodaLive/Sources/Live/SectionCommunityPostView.swift index 70e633e..4c6fa78 100644 --- a/SodaLive/Sources/Live/SectionCommunityPostView.swift +++ b/SodaLive/Sources/Live/SectionCommunityPostView.swift @@ -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() diff --git a/SodaLive/Sources/Live/SectionLatestFinishedLiveView.swift b/SodaLive/Sources/Live/SectionLatestFinishedLiveView.swift index 18c67f4..4ddd27e 100644 --- a/SodaLive/Sources/Live/SectionLatestFinishedLiveView.swift +++ b/SodaLive/Sources/Live/SectionLatestFinishedLiveView.swift @@ -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) diff --git a/SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift b/SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift index 3e0c825..01d49f2 100644 --- a/SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift +++ b/SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift @@ -60,7 +60,7 @@ struct TextMessageDetailView: View { messageItem.recipientNickname : messageItem.senderNickname ) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } .padding(.vertical, 12.7) @@ -94,7 +94,7 @@ struct TextMessageDetailView: View { if messageBox == .receive { HStack(spacing: 6.7) { Text("답장") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame( width: (screenSize().width - 40) / 3, @@ -107,7 +107,7 @@ struct TextMessageDetailView: View { } Text("보관") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "3bb9f1")) .frame( width: (screenSize().width - 40) / 3, @@ -126,7 +126,7 @@ struct TextMessageDetailView: View { } Text("삭제") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "3bb9f1")) .frame( width: (screenSize().width - 40) / 3, @@ -142,7 +142,7 @@ struct TextMessageDetailView: View { .padding(.vertical, 26.7) } else { Text("삭제") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "3bb9f1")) .frame( width: screenSize().width - 26.7, diff --git a/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift b/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift index dbe2bb0..b6d8ccd 100644 --- a/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift +++ b/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift @@ -28,7 +28,7 @@ struct TextMessageWriteView: View { Spacer() Text("새로운 메시지") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -97,7 +97,7 @@ struct TextMessageWriteView: View { Spacer() Text(viewModel.sendText) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame(width: screenSize().width - 26.7, height: 48.7) .background(Color(hex: "3bb9f1")) diff --git a/SodaLive/Sources/Message/Voice/VoiceMessageView.swift b/SodaLive/Sources/Message/Voice/VoiceMessageView.swift index 4953f70..570577d 100644 --- a/SodaLive/Sources/Message/Voice/VoiceMessageView.swift +++ b/SodaLive/Sources/Message/Voice/VoiceMessageView.swift @@ -115,7 +115,7 @@ struct VoiceMessageView: 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) @@ -134,7 +134,7 @@ struct VoiceMessageView: 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) .frame(width: (screenSize().width - 66.7) / 3) @@ -152,7 +152,7 @@ struct VoiceMessageView: 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 - 66.7) * 2 / 3) diff --git a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift index bbbf73e..065aeab 100644 --- a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift +++ b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift @@ -36,7 +36,7 @@ struct VoiceMessageWriteView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("음성메시지") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) Spacer() @@ -173,7 +173,7 @@ struct VoiceMessageWriteView: View { HStack(spacing: 13.3) { Text("다시 녹음") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "9970ff")) .frame(width: (proxy.size.width - 40) / 3, height: 50) .background(Color(hex: "9970ff").opacity(0.2)) @@ -189,7 +189,7 @@ struct VoiceMessageWriteView: View { } Text(viewModel.sendText) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .frame(width: (proxy.size.width - 40) * 2 / 3, height: 50) .background(Color(hex: "9970ff")) diff --git a/SodaLive/Sources/MyPage/Auth/AuthButtonView.swift b/SodaLive/Sources/MyPage/Auth/AuthButtonView.swift index d5a8a22..a7bf674 100644 --- a/SodaLive/Sources/MyPage/Auth/AuthButtonView.swift +++ b/SodaLive/Sources/MyPage/Auth/AuthButtonView.swift @@ -10,7 +10,7 @@ import SwiftUI struct AuthButtonView: View { var body: some View { Text("본인인증") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.horizontal, 13.3) .padding(.vertical, 20) diff --git a/SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift b/SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift index 515e9d7..f5f0ad0 100644 --- a/SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift +++ b/SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift @@ -95,13 +95,13 @@ struct CanItemView: View { var body: some View { HStack(spacing: 0) { Text(localizeCanWord(in: item.localizedTitle)) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() Text("\(NumberFormatter.localizedString(from: item.price, number: .currency))") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } .padding(.horizontal, 13.3) @@ -119,13 +119,13 @@ struct CanPgItemView: View { var body: some View { HStack(spacing: 0) { Text(localizeCanWord(in: item.title)) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() Text(item.priceStr.formatCurrency(currencyCode: item.currency)) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/MyPage/Can/Coupon/CanChargeCouponButtonView.swift b/SodaLive/Sources/MyPage/Can/Coupon/CanChargeCouponButtonView.swift index e2b5d2b..44313f5 100644 --- a/SodaLive/Sources/MyPage/Can/Coupon/CanChargeCouponButtonView.swift +++ b/SodaLive/Sources/MyPage/Can/Coupon/CanChargeCouponButtonView.swift @@ -11,7 +11,7 @@ struct CanChargeCouponButtonView: View { var body: some View { HStack(spacing: 5.3) { Text("쿠폰 등록") - .font(.custom(Font.bold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Image("ic_coupon") diff --git a/SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift b/SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift index d7d97ba..bfbd5b1 100644 --- a/SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift +++ b/SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift @@ -22,7 +22,7 @@ struct CanCouponView: View { ScrollView(.vertical, showsIndicators: false) { VStack(spacing: 0) { Text(I18n.CanCoupon.inputTitle) - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame(maxWidth: .infinity, alignment: .leading) @@ -46,7 +46,7 @@ struct CanCouponView: View { } Text(I18n.CanCoupon.submit) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .padding(.vertical, 16) .frame(maxWidth: .infinity) @@ -59,7 +59,7 @@ struct CanCouponView: View { VStack(alignment: .leading, spacing: 0) { Text(I18n.CanCoupon.guideHeader) - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.grayee) CanCouponNoticeItemView(notice: I18n.CanCoupon.guide1) @@ -78,7 +78,7 @@ struct CanCouponView: View { .padding(.vertical, 26.7) Text(I18n.CanCoupon.cautionHeader) - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.grayee) CanCouponNoticeItemView(notice: I18n.CanCoupon.caution1) diff --git a/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift b/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift index ca12e3e..8c5b34b 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift @@ -40,14 +40,14 @@ struct CanPaymentView: View { .frame(width: 26.7, height: 26.7, alignment: .top) Text(canProduct.localizedTitle) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.leading, 13.3) Spacer() Text("\(NumberFormatter.localizedString(from: canProduct.price, number: .currency))") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } .padding(.horizontal, 13.3) @@ -124,7 +124,7 @@ struct CanPaymentView: View { HStack(spacing: 0) { Text("\(NumberFormatter.localizedString(from: canProduct.price, number: .currency))") - .font(.custom(Font.bold.rawValue, size: 23.3)) + .appFont(size: 23.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } } @@ -132,7 +132,7 @@ struct CanPaymentView: View { Spacer() Text("결제하기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .padding(.vertical, 16) .frame(minWidth: 200) diff --git a/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift b/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift index c92fc61..eabfb91 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift @@ -73,7 +73,7 @@ struct CanPgPaymentView: View { HStack(spacing: 8) { Button(action: { showExitConfirm = true }) { Text("닫기") - .font(.custom(Font.bold.rawValue, size: 14)) + .appFont(size: 14, weight: .bold) .foregroundColor(.white) .padding(.horizontal, 12) .padding(.vertical, 8) @@ -111,14 +111,14 @@ struct CanPgPaymentView: View { .frame(width: 26.7, height: 26.7, alignment: .top) Text(canResponse.title) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.leading, 13.3) Spacer() Text(canResponse.priceStr.formatCurrency(currencyCode: canResponse.currency)) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color.grayee) } .padding(.horizontal, 13.3) @@ -130,7 +130,7 @@ struct CanPgPaymentView: View { .padding(.top, 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) .padding(.top, 26.7) @@ -282,7 +282,7 @@ struct CanPgPaymentView: View { HStack(spacing: 0) { Text(canResponse.priceStr.formatCurrency(currencyCode: canResponse.currency)) - .font(.custom(Font.bold.rawValue, size: 23.3)) + .appFont(size: 23.3, weight: .bold) .foregroundColor(Color.grayee) } } @@ -290,7 +290,7 @@ struct CanPgPaymentView: View { Spacer() Text("결제하기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .padding(.vertical, 16) .frame(minWidth: 200) diff --git a/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift b/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift index 6144c98..38d249e 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift @@ -71,14 +71,14 @@ struct CanPaymentTempView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text(self.title) - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .padding(.leading, 13.3) Spacer() Text("\(self.can * 110) 원") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color.grayee) } .padding(.horizontal, 13.3) @@ -90,7 +90,7 @@ struct CanPaymentTempView: View { .padding(.top, 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) .padding(.top, 26.7) @@ -200,7 +200,7 @@ struct CanPaymentTempView: View { HStack(spacing: 0) { Text("\(self.can * 110) 원") - .font(.custom(Font.bold.rawValue, size: 23.3)) + .appFont(size: 23.3, weight: .bold) .foregroundColor(Color.grayee) } } @@ -208,7 +208,7 @@ struct CanPaymentTempView: View { Spacer() Text("결제하기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .padding(.vertical, 16) .frame(minWidth: 200) diff --git a/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift b/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift index 2057317..2cd3e04 100644 --- a/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift +++ b/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift @@ -29,7 +29,7 @@ struct CanStatusView: View { .frame(width: 26.7, height: 26.7) Text("\(viewModel.totalCan)") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } @@ -41,7 +41,7 @@ struct CanStatusView: View { HStack(alignment: .bottom, spacing: 3.3) { Text("\(viewModel.chargeCan)") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") @@ -62,7 +62,7 @@ struct CanStatusView: View { HStack(alignment: .bottom, spacing: 3.3) { Text("\(viewModel.rewardCan)") - .font(.custom(Font.bold.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") @@ -143,7 +143,7 @@ struct CanStatusView: View { .frame(width: 26.7, height: 26.7) Text("충전하기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "1313bc")) } .padding(.vertical, 16) diff --git a/SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift b/SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift index ff7b483..e5077e1 100644 --- a/SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift +++ b/SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift @@ -48,7 +48,7 @@ struct CanUseStatusItemView: View { Spacer() Text("\(item.can)") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Image("ic_can") diff --git a/SodaLive/Sources/MyPage/CanCardView.swift b/SodaLive/Sources/MyPage/CanCardView.swift index 717d452..5f7f796 100644 --- a/SodaLive/Sources/MyPage/CanCardView.swift +++ b/SodaLive/Sources/MyPage/CanCardView.swift @@ -16,7 +16,7 @@ struct CanCardView: View { Button(action: { AppState.shared.setAppStep(step: .canStatus(refresh: refresh)) }) { HStack(spacing: 6.7) { Text("\(data.chargeCan + data.rewardCan)") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Image("ic_can") @@ -38,7 +38,7 @@ struct CanCardView: View { .frame(width: 26.7, height: 26.7) Text("충전") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color(hex: "b38fff")) } .padding(.horizontal, 11.3) diff --git a/SodaLive/Sources/MyPage/MyInfoCardView.swift b/SodaLive/Sources/MyPage/MyInfoCardView.swift index 312b2e2..b336d04 100644 --- a/SodaLive/Sources/MyPage/MyInfoCardView.swift +++ b/SodaLive/Sources/MyPage/MyInfoCardView.swift @@ -31,7 +31,7 @@ struct MyInfoCardView: View { VStack(alignment: .leading, spacing: 13.3) { HStack(spacing: 0) { Text(data.nickname) - .font(.custom(Font.bold.rawValue, size: 20)) + .appFont(size: 20, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/MyPage/MyPageView.swift b/SodaLive/Sources/MyPage/MyPageView.swift index b46644e..2e7f935 100644 --- a/SodaLive/Sources/MyPage/MyPageView.swift +++ b/SodaLive/Sources/MyPage/MyPageView.swift @@ -73,7 +73,7 @@ struct MyPageView: View { } else { HStack { Text("LOGIN") - .font(.custom(Font.preBold.rawValue, size: 32)) + .appFont(size: 32, weight: .bold) .foregroundColor(Color.gray77) } .padding(.vertical, 12) @@ -89,7 +89,7 @@ struct MyPageView: View { if UserDefaults.string(forKey: .role) == MemberRole.CREATOR.rawValue { Text("내 채널 보기") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 12) .frame(maxWidth: .infinity) @@ -483,11 +483,11 @@ struct RecentContentSection: View { VStack(alignment: .leading, spacing: 14) { HStack(spacing: 0) { Text("최근 들은 ") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "B0BEC5")) Text("\(recentContents.count)") - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "FDC118")) } .padding(.horizontal, 24) diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift index 56cb32d..b7afc5d 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift @@ -21,7 +21,7 @@ struct OrderListAllView: View { .frame(width: 20, height: 20) Text("콘텐츠 보관함") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) } diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListView.swift index fbdd50d..3373820 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListView.swift @@ -14,7 +14,7 @@ struct OrderListView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("콘텐츠 보관함") - .font(.custom(Font.bold.rawValue, size: 18)) + .appFont(size: 18, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/MyPage/Point/PointStatusView.swift b/SodaLive/Sources/MyPage/Point/PointStatusView.swift index 0c9e393..8b76018 100644 --- a/SodaLive/Sources/MyPage/Point/PointStatusView.swift +++ b/SodaLive/Sources/MyPage/Point/PointStatusView.swift @@ -29,7 +29,7 @@ struct PointStatusView: View { .frame(width: 26.7, height: 26.7) Text("\(viewModel.totalCan)") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) } } diff --git a/SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift b/SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift index bb06e50..a623e2c 100644 --- a/SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift +++ b/SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift @@ -41,7 +41,7 @@ struct NicknameUpdateView: View { .padding(.top, 40) Text("중복확인") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .frame(width: screenSize().width - 40) .padding(.vertical, 13.3) @@ -58,7 +58,7 @@ struct NicknameUpdateView: View { Spacer() Text(viewModel.price > 0 ? "\(viewModel.price)캔으로 닉네임 변경하기" : "닉네임 변경하기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 16) .frame(width: screenSize().width - 26.7) diff --git a/SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift b/SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift index 2e81717..b8d6ceb 100644 --- a/SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift +++ b/SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift @@ -58,7 +58,7 @@ struct ModifyPasswordView: View { if !viewModel.isLoading { 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) diff --git a/SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift b/SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift index 3a06bbb..4d93673 100644 --- a/SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift +++ b/SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift @@ -59,7 +59,7 @@ struct ProfileUpdateView: View { Button(action: { AppState.shared.setAppStep(step: .modifyPassword) }) { Text("비밀번호 변경") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 13.3) .padding(.horizontal, 22.7) @@ -99,7 +99,7 @@ struct ProfileUpdateView: View { Button(action: { AppState.shared.setAppStep(step: .changeNickname) }) { Text("닉네임 변경") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 13.3) .padding(.horizontal, 22.7) @@ -110,7 +110,7 @@ struct ProfileUpdateView: View { VStack(alignment: .leading, spacing: 13.3) { Text("성별") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color.button) .padding(.leading, 6.7) @@ -209,7 +209,7 @@ struct ProfileUpdateView: 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: { @@ -217,7 +217,7 @@ struct ProfileUpdateView: 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 - 53.4) @@ -264,7 +264,7 @@ struct ProfileUpdateView: View { func ContentInputView() -> 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) TextViewWrapper( @@ -347,7 +347,7 @@ struct ProfileUpdateView: View { if UserDefaults.string(forKey: .role) == MemberRole.CREATOR.rawValue { 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) @@ -377,7 +377,7 @@ struct ProfileUpdateView: View { Spacer() 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) diff --git a/SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift b/SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift index 0fe4302..dd47f91 100644 --- a/SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift +++ b/SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift @@ -30,7 +30,7 @@ struct MemberTagView: View { VStack(spacing: 0) { HStack(alignment: .top, spacing: 0) { Text("관심사 선택") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) Spacer() @@ -88,7 +88,7 @@ struct MemberTagView: 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) diff --git a/SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift b/SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift index b75d0c6..1a83a7d 100644 --- a/SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift @@ -24,7 +24,7 @@ struct LiveReservationCancelView: View { if let item = viewModel.selectedReservationStatusItem { if viewModel.isCancelComplete { 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, 33.3) @@ -125,7 +125,7 @@ struct LiveReservationCancelView: View { VStack(spacing: 13.3) { 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) @@ -186,7 +186,7 @@ struct LiveReservationCancelView: View { .frame(width: screenSize().width - 53.4, alignment: .leading) Text("예약취소") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(.white) .padding(.vertical, 16) .frame(width: screenSize().width - 26.7) diff --git a/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift b/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift index d25ef65..97376c9 100644 --- a/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift @@ -73,7 +73,7 @@ struct LiveReservationStatusItemView: View { Spacer() Text("예약\n취소") - .font(.custom(Font.bold.rawValue, size: 12)) + .appFont(size: 12, weight: .bold) .foregroundColor(Color(hex: "9970ff")) .padding(10.7) .overlay( diff --git a/SodaLive/Sources/MyPage/ReservationStatusView.swift b/SodaLive/Sources/MyPage/ReservationStatusView.swift index 55e7fa9..229ebe8 100644 --- a/SodaLive/Sources/MyPage/ReservationStatusView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatusView.swift @@ -13,7 +13,7 @@ struct ReservationStatusView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text("예약현황") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) HStack(spacing: 0) { @@ -25,7 +25,7 @@ struct ReservationStatusView: View { .frame(width: 20, height: 20) Text("라이브") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color(hex: "3bb9f1")) Text("\(data.liveReservationCount)") diff --git a/SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift b/SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift index f1aab17..9eee845 100644 --- a/SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift +++ b/SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift @@ -22,7 +22,7 @@ struct FaqView: View { VStack(spacing: 0) { HStack(alignment: .top, spacing: 6.7) { Text("Q") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.button) Text(faq.question) @@ -42,7 +42,7 @@ struct FaqView: View { if openIndex == index { HStack(alignment: .top, spacing: 6.7) { Text("A") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(Color.button) .padding(.top, 13.3) diff --git a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterButtonView.swift b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterButtonView.swift index 8f459eb..922afc3 100644 --- a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterButtonView.swift +++ b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterButtonView.swift @@ -15,7 +15,7 @@ struct ServiceCenterButtonView: View { .frame(width: 26.7, height: 26.7) Text("보이스온 고객센터") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift index 8efee47..587c522 100644 --- a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift +++ b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift @@ -24,7 +24,7 @@ struct ServiceCenterView: View { .frame(width: 106.7, height: 106.7, alignment: .top) Text("고객센터") - .font(.custom(Font.bold.rawValue, size: 20)) + .appFont(size: 20, weight: .bold) .foregroundColor(.grayee) .padding(.top, 20) @@ -35,7 +35,7 @@ struct ServiceCenterView: View { .frame(width: 21, height: 18.8, alignment: .top) Text("TALK 문의") - .font(.custom(Font.bold.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .bold) .foregroundColor(.black) } .padding(.vertical, 14) @@ -54,7 +54,7 @@ struct ServiceCenterView: View { .padding(.vertical, 20) Text("자주 묻는 질문") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) .frame(maxWidth: .infinity, alignment: .leading) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/NavigationBar/DetailNavigationBar.swift b/SodaLive/Sources/NavigationBar/DetailNavigationBar.swift index ba5575c..56e8a4f 100644 --- a/SodaLive/Sources/NavigationBar/DetailNavigationBar.swift +++ b/SodaLive/Sources/NavigationBar/DetailNavigationBar.swift @@ -26,7 +26,7 @@ struct DetailNavigationBar: View { .frame(width: 20, height: 20) Text(LocalizedStringResource(stringLiteral: title)) - .font(.custom(Font.preBold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.grayee) .lineLimit(1) .truncationMode(.tail) diff --git a/SodaLive/Sources/NavigationBar/HomeNavigationBar.swift b/SodaLive/Sources/NavigationBar/HomeNavigationBar.swift index 8c80782..d753798 100644 --- a/SodaLive/Sources/NavigationBar/HomeNavigationBar.swift +++ b/SodaLive/Sources/NavigationBar/HomeNavigationBar.swift @@ -23,7 +23,7 @@ struct HomeNavigationBar: View { var body: some View { HStack { Text(title) - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/Onboarding/OnboardingView.swift b/SodaLive/Sources/Onboarding/OnboardingView.swift index b8a99b6..74c3a69 100644 --- a/SodaLive/Sources/Onboarding/OnboardingView.swift +++ b/SodaLive/Sources/Onboarding/OnboardingView.swift @@ -48,7 +48,7 @@ struct OnboardingView: View { } Text("시작하기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(.white) .frame(width: screenSize().width, height: 60) .background(Color(hex: "80D8FF")) diff --git a/SodaLive/Sources/Search/SearchUnifiedView.swift b/SodaLive/Sources/Search/SearchUnifiedView.swift index ccf2f54..d6e5a3f 100644 --- a/SodaLive/Sources/Search/SearchUnifiedView.swift +++ b/SodaLive/Sources/Search/SearchUnifiedView.swift @@ -63,7 +63,7 @@ struct SearchUnifiedItemView: View { var body: some View { VStack(alignment: .leading, spacing: 13.3) { Text(title) - .font(.custom(Font.bold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(.grayee) ForEach(0.. 0, let url = URL(string: link), UIApplication.shared.canOpenURL(url) { 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) diff --git a/SodaLive/Sources/Settings/Language/Views/LanguageSettingsView.swift b/SodaLive/Sources/Settings/Language/Views/LanguageSettingsView.swift index 86dcc33..0df3a85 100644 --- a/SodaLive/Sources/Settings/Language/Views/LanguageSettingsView.swift +++ b/SodaLive/Sources/Settings/Language/Views/LanguageSettingsView.swift @@ -59,7 +59,7 @@ struct LanguageSettingsView: View { Task { await viewModel.applyAndRestart() } }) { Text(String(localized: "적용")) - .font(.custom(Font.preBold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .frame(width: cardWidth, height: 50) .background(Color.button) .cornerRadius(6.7) diff --git a/SodaLive/Sources/Settings/Notification/NotificationSettingsDialog.swift b/SodaLive/Sources/Settings/Notification/NotificationSettingsDialog.swift index 5993037..95d1631 100644 --- a/SodaLive/Sources/Settings/Notification/NotificationSettingsDialog.swift +++ b/SodaLive/Sources/Settings/Notification/NotificationSettingsDialog.swift @@ -21,7 +21,7 @@ struct NotificationSettingsDialog: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("라이브 알림") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -41,7 +41,7 @@ struct NotificationSettingsDialog: View { HStack(spacing: 0) { Text("콘텐츠 업로드 알림") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -61,7 +61,7 @@ struct NotificationSettingsDialog: View { HStack(spacing: 0) { Text("메시지 알림") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -75,7 +75,7 @@ struct NotificationSettingsDialog: View { } Text("확인") - .font(.custom(Font.bold.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .bold) .foregroundColor(Color(hex: "ffffff")) .padding(.vertical, 16) .frame(width: (geo.size.width - 66.7) * 2 / 3) diff --git a/SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift b/SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift index 008ea3e..abfdf6e 100644 --- a/SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift +++ b/SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift @@ -20,7 +20,7 @@ struct NotificationSettingsView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("라이브 알림") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -40,7 +40,7 @@ struct NotificationSettingsView: View { HStack(spacing: 0) { Text("콘텐츠 업로드 알림") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -60,7 +60,7 @@ struct NotificationSettingsView: View { HStack(spacing: 0) { Text("메시지 알림") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/Settings/SettingsView.swift b/SodaLive/Sources/Settings/SettingsView.swift index 3935621..c3bbab8 100644 --- a/SodaLive/Sources/Settings/SettingsView.swift +++ b/SodaLive/Sources/Settings/SettingsView.swift @@ -27,7 +27,7 @@ struct SettingsView: 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() @@ -49,7 +49,7 @@ struct SettingsView: View { HStack(spacing: 0) { Text("언어 설정") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -72,7 +72,7 @@ struct SettingsView: View { HStack(spacing: 0) { Text("콘텐츠 보기 설정") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -98,7 +98,7 @@ struct SettingsView: 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() @@ -120,7 +120,7 @@ struct SettingsView: View { HStack(spacing: 0) { Text("개인정보처리방침") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -144,7 +144,7 @@ struct SettingsView: View { HStack(spacing: 0) { Text("앱 버전 정보") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) Spacer() @@ -182,7 +182,7 @@ struct SettingsView: View { .padding(.top, 13.3) Text("로그아웃") - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(Color.grayee) .frame(width: cardWidth, height: 50) .background(Color.gray22) diff --git a/SodaLive/Sources/Settings/SignOut/SignOutView.swift b/SodaLive/Sources/Settings/SignOut/SignOutView.swift index a9524cf..17461dc 100644 --- a/SodaLive/Sources/Settings/SignOut/SignOutView.swift +++ b/SodaLive/Sources/Settings/SignOut/SignOutView.swift @@ -20,7 +20,7 @@ struct SignOutView: View { VStack(spacing: 0) { VStack(spacing: 13.3) { Text("정말로 탈퇴하실 거에요?\n한 번 더 생각해보지 않으실래요?") - .font(.custom(Font.bold.rawValue, size: 20)) + .appFont(size: 20, weight: .bold) .foregroundColor(Color(hex: "3bb9f1")) .frame(width: screenSize().width - 26.7, alignment: .leading) @@ -99,7 +99,7 @@ struct SignOutView: View { .padding(.top, 8) Text("탈퇴하기") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .foregroundColor(.white) .padding(.vertical, 16) .frame(width: screenSize().width - 26.7) diff --git a/SodaLive/Sources/Splash/SplashView.swift b/SodaLive/Sources/Splash/SplashView.swift index 7a7f357..a9e1ce8 100644 --- a/SodaLive/Sources/Splash/SplashView.swift +++ b/SodaLive/Sources/Splash/SplashView.swift @@ -26,14 +26,14 @@ struct SplashView: View { Spacer() Text(I18n.Splash.tagline) - .font(.custom(Font.preBold.rawValue, size: 23)) + .appFont(size: 23, weight: .bold) .foregroundColor(.white) Image("splash_text_logo") .padding(.top, 10) Text(I18n.Splash.brandName) - .font(.custom(Font.preBold.rawValue, size: 21)) + .appFont(size: 21, weight: .bold) .foregroundColor(.white) .padding(.top, 52) } diff --git a/SodaLive/Sources/UI/Component/SelectedButtonView.swift b/SodaLive/Sources/UI/Component/SelectedButtonView.swift index 069ee01..29c03f7 100644 --- a/SodaLive/Sources/UI/Component/SelectedButtonView.swift +++ b/SodaLive/Sources/UI/Component/SelectedButtonView.swift @@ -28,7 +28,7 @@ struct SelectedButtonView: View { } Text(title) - .font(.custom(Font.bold.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .bold) .foregroundColor(!isActive ? textDisabledColor : isSelected ? textSelectedColor : textDefaultColor) } .padding(.vertical, isSelected ? 14.3 : 17) diff --git a/SodaLive/Sources/User/FindPassword/FindPasswordView.swift b/SodaLive/Sources/User/FindPassword/FindPasswordView.swift index fc90946..d323b53 100644 --- a/SodaLive/Sources/User/FindPassword/FindPasswordView.swift +++ b/SodaLive/Sources/User/FindPassword/FindPasswordView.swift @@ -22,7 +22,7 @@ struct FindPasswordView: View { ScrollView(.vertical, showsIndicators: false) { VStack(spacing: 0) { Text("회원가입한 이메일 주소로\n임시 비밀번호를 보내드립니다.") - .font(.custom(Font.bold.rawValue, size: 16)) + .appFont(size: 16, weight: .bold) .foregroundColor(Color(hex: "eeeeee")) .multilineTextAlignment(.center) .lineSpacing(6) @@ -55,7 +55,7 @@ struct FindPasswordView: View { } Text("임시 비밀번호 받기") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.white) .frame(maxWidth: proxy.size.width - 26.7) .padding(.vertical, 16) diff --git a/SodaLive/Sources/User/Login/LoginView.swift b/SodaLive/Sources/User/Login/LoginView.swift index f0c0979..dff73d6 100644 --- a/SodaLive/Sources/User/Login/LoginView.swift +++ b/SodaLive/Sources/User/Login/LoginView.swift @@ -86,7 +86,7 @@ struct LoginView: View { } ) { Text("로그인") - .font(.custom(Font.bold.rawValue, size: 15)) + .appFont(size: 15, weight: .bold) .frame(width: screenSize().width - 26.6, height: 46.7) .foregroundColor(.white) .background(Color.button) diff --git a/SodaLive/Sources/User/SignUp/SignUpView.swift b/SodaLive/Sources/User/SignUp/SignUpView.swift index 347f03e..10cf19d 100644 --- a/SodaLive/Sources/User/SignUp/SignUpView.swift +++ b/SodaLive/Sources/User/SignUp/SignUpView.swift @@ -153,7 +153,7 @@ struct SignUpView: View { .padding(.horizontal, 13.3) Text("회원가입") - .font(.custom(Font.bold.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .bold) .foregroundColor(Color.white) .padding(.vertical, 16) .frame(maxWidth: .infinity)