diff --git a/SodaLive/Sources/Content/All/ContentRankingAllView.swift b/SodaLive/Sources/Content/All/ContentRankingAllView.swift index 2bdfbdc..f1ccda8 100644 --- a/SodaLive/Sources/Content/All/ContentRankingAllView.swift +++ b/SodaLive/Sources/Content/All/ContentRankingAllView.swift @@ -24,7 +24,7 @@ struct ContentRankingAllView: View { .foregroundColor(Color(hex: "eeeeee")) Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.") - .font(.custom(Font.light.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .light) .foregroundColor(Color(hex: "bbbbbb")) } .padding(.vertical, 8) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailPurchaseButton.swift b/SodaLive/Sources/Content/Detail/ContentDetailPurchaseButton.swift index a402c32..4767a1e 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailPurchaseButton.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailPurchaseButton.swift @@ -27,7 +27,7 @@ struct ContentDetailPurchaseButton: View { .padding(.leading, 5.3) Text(UserDefaults.int(forKey: .userId) == 17958 ? "원으로": "캔으로") - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(.white) Text(title) diff --git a/SodaLive/Sources/Content/Detail/ContentOrderDialogView.swift b/SodaLive/Sources/Content/Detail/ContentOrderDialogView.swift index 73248d3..172bedb 100644 --- a/SodaLive/Sources/Content/Detail/ContentOrderDialogView.swift +++ b/SodaLive/Sources/Content/Detail/ContentOrderDialogView.swift @@ -32,7 +32,7 @@ struct ContentOrderDialogView: View { .foregroundColor(.white) Text("(이용기간 5일)") - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(.white) } @@ -78,7 +78,7 @@ struct ContentOrderDialogView: View { .foregroundColor(.white) Text("(서비스 종료시까지)") - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(.white) } diff --git a/SodaLive/Sources/Content/Main/Order/ContentMainMyStashView.swift b/SodaLive/Sources/Content/Main/Order/ContentMainMyStashView.swift index fa14447..5d62e7f 100644 --- a/SodaLive/Sources/Content/Main/Order/ContentMainMyStashView.swift +++ b/SodaLive/Sources/Content/Main/Order/ContentMainMyStashView.swift @@ -23,7 +23,7 @@ struct ContentMainMyStashView: View { Spacer() Text("전체보기") - .font(.custom(Font.light.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .light) .foregroundColor(Color(hex: "bbbbbb")) .onTapGesture { AppState.shared.setAppStep(step: .orderListAll) diff --git a/SodaLive/Sources/Content/Main/Ranking/ContentMainCreatorRankingView.swift b/SodaLive/Sources/Content/Main/Ranking/ContentMainCreatorRankingView.swift index 4805824..844e7f3 100644 --- a/SodaLive/Sources/Content/Main/Ranking/ContentMainCreatorRankingView.swift +++ b/SodaLive/Sources/Content/Main/Ranking/ContentMainCreatorRankingView.swift @@ -55,7 +55,7 @@ struct ContentMainCreatorRankingView: View { .foregroundColor(Color.grayee) Text("※ 인기 크리에이터의 순위는 매주 업데이트됩니다.") - .font(.custom(Font.light.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .light) .foregroundColor(Color.graybb) } .padding(.vertical, 8) diff --git a/SodaLive/Sources/Content/Main/Ranking/ContentMainRankingView.swift b/SodaLive/Sources/Content/Main/Ranking/ContentMainRankingView.swift index 7b752ee..4cd2710 100644 --- a/SodaLive/Sources/Content/Main/Ranking/ContentMainRankingView.swift +++ b/SodaLive/Sources/Content/Main/Ranking/ContentMainRankingView.swift @@ -39,7 +39,7 @@ struct ContentMainRankingView: View { .foregroundColor(Color(hex: "eeeeee")) Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.") - .font(.custom(Font.light.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .light) .foregroundColor(Color(hex: "bbbbbb")) } .padding(.vertical, 8) diff --git a/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift b/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift index 9eed9eb..14c6234 100644 --- a/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift +++ b/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift @@ -31,7 +31,7 @@ struct ContentMainTabHomeRankCreatorView: View { .foregroundColor(Color.grayee) Text("※ 인기 순위는 매주 업데이트됩니다.") - .font(.custom(Font.light.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .light) .foregroundColor(Color.graybb) } .padding(.vertical, 8) diff --git a/SodaLive/Sources/Content/Series/Detail/SeriesDetailHomeView.swift b/SodaLive/Sources/Content/Series/Detail/SeriesDetailHomeView.swift index 1ae018e..f3b3ec5 100644 --- a/SodaLive/Sources/Content/Series/Detail/SeriesDetailHomeView.swift +++ b/SodaLive/Sources/Content/Series/Detail/SeriesDetailHomeView.swift @@ -22,7 +22,7 @@ struct SeriesDetailHomeView: View { .foregroundColor(Color.button) Text(" (\(contentCount))") - .font(.custom(Font.light.rawValue, size: 16)) + .appFont(size: 16, weight: .light) .foregroundColor(Color.button) } .frame(maxWidth: .infinity) diff --git a/SodaLive/Sources/Explorer/ExplorerSectionView.swift b/SodaLive/Sources/Explorer/ExplorerSectionView.swift index 66508e2..c0f91f3 100644 --- a/SodaLive/Sources/Explorer/ExplorerSectionView.swift +++ b/SodaLive/Sources/Explorer/ExplorerSectionView.swift @@ -52,7 +52,7 @@ struct ExplorerSectionView: View { .foregroundColor(Color(hex: "eeeeee")) Text("※ 인기 크리에이터의 순위는 매주 업데이트됩니다.") - .font(.custom(Font.light.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .light) .foregroundColor(Color(hex: "bbbbbb")) } .padding(.vertical, 8) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift index cc2ff46..6a9d534 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift @@ -59,7 +59,7 @@ struct CreatorCommunityAllItemView: View { .foregroundColor(Color.grayee) Text(item.relativeTimeText()) - .font(.custom(Font.light.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .light) .foregroundColor(Color.gray77) } .padding(.leading, 11) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityMoreItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityMoreItemView.swift index 805cf86..110c09c 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityMoreItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityMoreItemView.swift @@ -18,7 +18,7 @@ struct CreatorCommunityMoreItemView: View { .frame(width: 40, height: 40) Text("더보기") - .font(.custom(Font.light.rawValue, size: 11)) + .appFont(size: 11, weight: .light) .foregroundColor(Color(hex: "bbbbbb")) } .onTapGesture { onClick() } diff --git a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkAllView.swift b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkAllView.swift index 2f42a3f..5ae5344 100644 --- a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkAllView.swift +++ b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkAllView.swift @@ -116,7 +116,7 @@ struct UserProfileFanTalkAllView: View { } } else { Text("응원이 없습니다.\n\n처음으로 응원을 해보세요!") - .font(.custom(Font.light.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .light) .foregroundColor(Color.graybb) .multilineTextAlignment(.center) .fixedSize(horizontal: false, vertical: true) diff --git a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift index 768c7c1..6c39e99 100644 --- a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift +++ b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift @@ -32,7 +32,7 @@ struct UserProfileFanTalkView: View { Spacer() Text("전체보기") - .font(.custom(Font.preLight.rawValue, size: 14)) + .appFont(size: 14, weight: .light) .foregroundColor(Color(hex: "78909C")) .onTapGesture { AppState.shared.setAppStep(step: .userProfileFanTalkAll(userId: userId)) @@ -110,7 +110,7 @@ struct UserProfileFanTalkView: View { } } else { Text("응원이 없습니다.\n\n처음으로 응원을 해보세요!") - .font(.custom(Font.preLight.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .light) .foregroundColor(Color.graybb) .multilineTextAlignment(.center) .fixedSize(horizontal: false, vertical: true) diff --git a/SodaLive/Sources/Explorer/Profile/Series/UserProfileSeriesView.swift b/SodaLive/Sources/Explorer/Profile/Series/UserProfileSeriesView.swift index 28d0fa1..b0f9aff 100644 --- a/SodaLive/Sources/Explorer/Profile/Series/UserProfileSeriesView.swift +++ b/SodaLive/Sources/Explorer/Profile/Series/UserProfileSeriesView.swift @@ -22,7 +22,7 @@ struct UserProfileSeriesView: View { Spacer() Text("전체보기") - .font(.custom(Font.preLight.rawValue, size: 14)) + .appFont(size: 14, weight: .light) .foregroundColor(Color(hex: "78909C")) .onTapGesture { AppState.shared diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift index cd1dc65..efae15a 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift @@ -31,7 +31,7 @@ struct UserProfileContentView: View { Spacer() Text("전체보기") - .font(.custom(Font.preLight.rawValue, size: 14)) + .appFont(size: 14, weight: .light) .foregroundColor(Color(hex: "78909C")) .onTapGesture { AppState.shared.setAppStep(step: .contentListAll(userId: userId)) diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift index f664b77..56b311f 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift @@ -60,7 +60,7 @@ struct UserProfileDonationAllView: View { .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "eeeeee")) } @@ -76,7 +76,7 @@ struct UserProfileDonationAllView: View { .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "eeeeee")) } @@ -92,7 +92,7 @@ struct UserProfileDonationAllView: View { .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "eeeeee")) } } diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift index 4cff34b..26adb58 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift @@ -30,7 +30,7 @@ struct UserProfileDonationView: View { Spacer() Text("전체보기") - .font(.custom(Font.preLight.rawValue, size: 14)) + .appFont(size: 14, weight: .light) .foregroundColor(Color(hex: "78909C")) .onTapGesture { AppState.shared.setAppStep(step: .userProfileDonationAll(userId: userId)) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift index bcda270..3dd3074 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift @@ -36,7 +36,7 @@ struct LiveRoomDonationMessageDialog: View { Spacer() Text("닫기") - .font(.custom(Font.light.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .light) .foregroundColor(Color(hex: "eeeeee")) .onTapGesture { isShowing = false } } diff --git a/SodaLive/Sources/Live/Room/LiveRoomTopCreatorView.swift b/SodaLive/Sources/Live/Room/LiveRoomTopCreatorView.swift index 6166736..fc1ef0b 100644 --- a/SodaLive/Sources/Live/Room/LiveRoomTopCreatorView.swift +++ b/SodaLive/Sources/Live/Room/LiveRoomTopCreatorView.swift @@ -38,7 +38,7 @@ struct LiveRoomTopCreatorView: View { Image("ic_crown") Text(nickname) - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "eeeeee")) if creatorId != UserDefaults.int(forKey: .userId) { diff --git a/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift b/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift index d78d090..55633aa 100644 --- a/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift +++ b/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift @@ -417,7 +417,7 @@ struct LiveRoomViewV2: View { .foregroundColor(.white) Text(liveRoomInfo.menuPan) - .font(.custom(Font.light.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .light) .foregroundColor(.white) .lineSpacing(4) } diff --git a/SodaLive/Sources/Message/Text/TextMessageItemView.swift b/SodaLive/Sources/Message/Text/TextMessageItemView.swift index 443cf96..86d7c1f 100644 --- a/SodaLive/Sources/Message/Text/TextMessageItemView.swift +++ b/SodaLive/Sources/Message/Text/TextMessageItemView.swift @@ -39,7 +39,7 @@ struct TextMessageItemView: View { .foregroundColor(Color(hex: "eeeeee")) Text(item.textMessage) - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "777777")) .multilineTextAlignment(.leading) .lineLimit(2) @@ -48,7 +48,7 @@ struct TextMessageItemView: View { Spacer() Text(item.date) - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "525252")) } } diff --git a/SodaLive/Sources/Message/Voice/VoiceMessageItemView.swift b/SodaLive/Sources/Message/Voice/VoiceMessageItemView.swift index dd71e13..12e6283 100644 --- a/SodaLive/Sources/Message/Voice/VoiceMessageItemView.swift +++ b/SodaLive/Sources/Message/Voice/VoiceMessageItemView.swift @@ -54,7 +54,7 @@ struct VoiceMessageItemView: View { Spacer() Text(item.date) - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "525252")) } .contentShape(Rectangle()) diff --git a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift index b013e7b..549bc25 100644 --- a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift +++ b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift @@ -106,7 +106,7 @@ struct VoiceMessageWriteView: View { } Text(secondsToHoursMinutesSeconds(seconds:Int(progress))) - .font(.custom(Font.light.rawValue, size: 33.3)) + .appFont(size: 33.3, weight: .light) .foregroundColor(.white) .padding(.top, 81) diff --git a/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift b/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift index b4f9613..2d48d51 100644 --- a/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift +++ b/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift @@ -36,7 +36,7 @@ struct CanStatusView: View { HStack(spacing: 26.7) { VStack(spacing: 10) { Text("결제 캔") - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "777777")) HStack(alignment: .bottom, spacing: 3.3) { @@ -57,7 +57,7 @@ struct CanStatusView: View { VStack(spacing: 10) { Text("리워드 캔") - .font(.custom(Font.light.rawValue, size: 12)) + .appFont(size: 12, weight: .light) .foregroundColor(Color(hex: "777777")) HStack(alignment: .bottom, spacing: 3.3) { diff --git a/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift b/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift index a020036..563c925 100644 --- a/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift @@ -60,7 +60,7 @@ struct LiveReservationStatusItemView: View { if !item.cancelable { Text("예약 취소 불가") - .font(.custom(Font.light.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .light) .foregroundColor(Color(hex: "777777")) } }