diff --git a/SodaLive/Sources/Audition/Applicant/ApplyMethodView.swift b/SodaLive/Sources/Audition/Applicant/ApplyMethodView.swift index 28e760a..7735e9e 100644 --- a/SodaLive/Sources/Audition/Applicant/ApplyMethodView.swift +++ b/SodaLive/Sources/Audition/Applicant/ApplyMethodView.swift @@ -40,7 +40,7 @@ struct ApplyMethodView: View { Image("ic_upload") Text("파일 업로드") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.button) } .padding(.vertical, 8) @@ -61,7 +61,7 @@ struct ApplyMethodView: View { Image("ic_mic_color_button") Text("바로 녹음") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.button) } .padding(.vertical, 8) @@ -82,7 +82,7 @@ struct ApplyMethodView: View { HStack(spacing: 0) { Text("※ 파일은 mp3, aac만 업로드 가능") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) .padding(.top, 13.3) diff --git a/SodaLive/Sources/Audition/Applicant/AuditionApplicantItemView.swift b/SodaLive/Sources/Audition/Applicant/AuditionApplicantItemView.swift index 50082e7..2900d1e 100644 --- a/SodaLive/Sources/Audition/Applicant/AuditionApplicantItemView.swift +++ b/SodaLive/Sources/Audition/Applicant/AuditionApplicantItemView.swift @@ -43,7 +43,7 @@ struct AuditionApplicantItemView: View { VStack(spacing: 8) { HStack(spacing: 0) { Text(item.nickname.count > 9 ? "\(item.nickname.prefix(9))..." : item.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.white) .onTapGesture { AppState.shared.setAppStep(step: .creatorDetail(userId: item.memberId)) @@ -53,7 +53,7 @@ struct AuditionApplicantItemView: View { if soundManager.applicantId == item.applicantId { Text("\(secondsToMinutesSeconds(Int(soundManager.currentTime)))/\(secondsToMinutesSeconds(Int(soundManager.duration)))") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) } } @@ -68,7 +68,7 @@ struct AuditionApplicantItemView: View { Image("ic_heart_vote") Text("\(item.voteCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) } .onTapGesture { diff --git a/SodaLive/Sources/Audition/Applicant/AuditionApplicantRecordingView.swift b/SodaLive/Sources/Audition/Applicant/AuditionApplicantRecordingView.swift index ab79c5f..0abcb2e 100644 --- a/SodaLive/Sources/Audition/Applicant/AuditionApplicantRecordingView.swift +++ b/SodaLive/Sources/Audition/Applicant/AuditionApplicantRecordingView.swift @@ -77,7 +77,7 @@ struct AuditionApplicantRecordingView: View { Spacer() Text("삭제") - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color.graybb.opacity(0)) Spacer() @@ -100,7 +100,7 @@ struct AuditionApplicantRecordingView: View { Spacer() Text("삭제") - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color.graybb) .onTapGesture { soundManager.stopAudio() @@ -178,7 +178,7 @@ struct AuditionApplicantRecordingView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Audition/Applicant/AuditionApplyView.swift b/SodaLive/Sources/Audition/Applicant/AuditionApplyView.swift index e34fb4e..661e7ff 100644 --- a/SodaLive/Sources/Audition/Applicant/AuditionApplyView.swift +++ b/SodaLive/Sources/Audition/Applicant/AuditionApplyView.swift @@ -34,7 +34,7 @@ struct AuditionApplyView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 0) { Text("오디션 지원") - .font(.custom(Font.medium.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .medium) .foregroundColor(.white) Spacer() @@ -54,7 +54,7 @@ struct AuditionApplyView: View { Image("ic_note_square") Text(filename) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayd2) Spacer() @@ -75,7 +75,7 @@ struct AuditionApplyView: View { .autocapitalization(.none) .disableAutocorrection(true) .keyboardType(.decimalPad) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) .padding(.horizontal, 13.3) .padding(.vertical, 17) @@ -90,7 +90,7 @@ struct AuditionApplyView: View { .frame(width: 20, height: 20) Text("보이스온 오디오 드라마 오디션 합격시 개인 연락을 위한 개인 정보(연락처) 수집 및 활용에 동의합니다.\n오디션 지원자는 개인정보 수집 및 활용 동의에 거부할 권리가 있으며 비동의시 오디션 지원은 취소 됩니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .lineSpacing(3) } @@ -137,7 +137,7 @@ struct AuditionApplyView: View { Text(errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Audition/AuditionItemView.swift b/SodaLive/Sources/Audition/AuditionItemView.swift index 6e3794c..df1c6a5 100644 --- a/SodaLive/Sources/Audition/AuditionItemView.swift +++ b/SodaLive/Sources/Audition/AuditionItemView.swift @@ -31,7 +31,7 @@ struct AuditionItemView: View { .frame(maxWidth: .infinity) Text(item.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(1) .truncationMode(.tail) diff --git a/SodaLive/Sources/Audition/AuditionView.swift b/SodaLive/Sources/Audition/AuditionView.swift index 1b26052..583a944 100644 --- a/SodaLive/Sources/Audition/AuditionView.swift +++ b/SodaLive/Sources/Audition/AuditionView.swift @@ -44,13 +44,13 @@ struct AuditionView: View { HStack(spacing: 0) { Text("보이스온 오디션 이용방법") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) Spacer() Text("자세히>") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) } .padding(.horizontal, 13.3) @@ -84,7 +84,7 @@ struct AuditionView: View { Spacer() Text("총 \(viewModel.inProgressCount)개") - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(Color.graybb) } @@ -122,7 +122,7 @@ struct AuditionView: View { Spacer() Text("총 \(viewModel.completedCount)개") - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(Color.graybb) } .padding(.top, 30) diff --git a/SodaLive/Sources/Audition/Detail/AuditionDetailView.swift b/SodaLive/Sources/Audition/Detail/AuditionDetailView.swift index c9a498c..671acf4 100644 --- a/SodaLive/Sources/Audition/Detail/AuditionDetailView.swift +++ b/SodaLive/Sources/Audition/Detail/AuditionDetailView.swift @@ -74,7 +74,7 @@ struct AuditionDetailView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Audition/Role/AuditionDetailRoleItemView.swift b/SodaLive/Sources/Audition/Role/AuditionDetailRoleItemView.swift index 57f1a78..582d34d 100644 --- a/SodaLive/Sources/Audition/Role/AuditionDetailRoleItemView.swift +++ b/SodaLive/Sources/Audition/Role/AuditionDetailRoleItemView.swift @@ -29,7 +29,7 @@ struct AuditionDetailRoleItemView: View { ) Text(item.isComplete ? "모집완료" : "모집중") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.white) .padding(.horizontal, 9) .padding(.vertical, 3) @@ -43,7 +43,7 @@ struct AuditionDetailRoleItemView: View { .frame(maxWidth: .infinity) Text(item.name) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(1) .truncationMode(.tail) diff --git a/SodaLive/Sources/Audition/Role/AuditionRoleDetailView.swift b/SodaLive/Sources/Audition/Role/AuditionRoleDetailView.swift index ad82378..cb7c08c 100644 --- a/SodaLive/Sources/Audition/Role/AuditionRoleDetailView.swift +++ b/SodaLive/Sources/Audition/Role/AuditionRoleDetailView.swift @@ -84,28 +84,28 @@ struct AuditionRoleDetailView: View { if viewModel.applicantList.isEmpty { Text("지원자가 없습니다.") - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color.grayee) .padding(.top, 15) } else { HStack(spacing: 0) { Text("참여자") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) Text("\(viewModel.totalCount)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) .padding(.leading, 2.3) Text("명") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) Spacer() Text("최신순") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( viewModel.sortType == .NEWEST ? Color.button : Color.graybb ) @@ -114,7 +114,7 @@ struct AuditionRoleDetailView: View { } Text("좋아요순") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( viewModel.sortType == .LIKES ? Color.button : Color.graybb ) @@ -156,7 +156,7 @@ struct AuditionRoleDetailView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) @@ -171,7 +171,7 @@ struct AuditionRoleDetailView: View { Text(soundManager.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Chat/Character/CharacterView.swift b/SodaLive/Sources/Chat/Character/CharacterView.swift index 6b2d409..e745f6e 100644 --- a/SodaLive/Sources/Chat/Character/CharacterView.swift +++ b/SodaLive/Sources/Chat/Character/CharacterView.swift @@ -127,7 +127,7 @@ struct CharacterView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift b/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift index 25a0cde..5a48ad3 100644 --- a/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift +++ b/SodaLive/Sources/Chat/Character/Detail/CharacterDetailView.swift @@ -141,7 +141,7 @@ struct CharacterDetailView: View { .frame(alignment: .center) .frame(maxWidth: .infinity) .padding(.horizontal, 33.3) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Chat/Character/Detail/Gallery/CharacterDetailGalleryView.swift b/SodaLive/Sources/Chat/Character/Detail/Gallery/CharacterDetailGalleryView.swift index e8a6d38..8fdf0dc 100644 --- a/SodaLive/Sources/Chat/Character/Detail/Gallery/CharacterDetailGalleryView.swift +++ b/SodaLive/Sources/Chat/Character/Detail/Gallery/CharacterDetailGalleryView.swift @@ -54,7 +54,7 @@ struct CharacterDetailGalleryView: View { .frame(alignment: .center) .frame(maxWidth: .infinity) .padding(.horizontal, 33.3) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Chat/Character/New/Views/NewCharacterListView.swift b/SodaLive/Sources/Chat/Character/New/Views/NewCharacterListView.swift index b6d738c..2d7717e 100644 --- a/SodaLive/Sources/Chat/Character/New/Views/NewCharacterListView.swift +++ b/SodaLive/Sources/Chat/Character/New/Views/NewCharacterListView.swift @@ -99,7 +99,7 @@ struct NewCharacterListView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Chat/Original/OriginalTabView.swift b/SodaLive/Sources/Chat/Original/OriginalTabView.swift index a8e221e..9ca828a 100644 --- a/SodaLive/Sources/Chat/Original/OriginalTabView.swift +++ b/SodaLive/Sources/Chat/Original/OriginalTabView.swift @@ -76,7 +76,7 @@ struct OriginalTabView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift b/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift index 44c175a..77469c1 100644 --- a/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift +++ b/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift @@ -315,7 +315,7 @@ struct ChatRoomView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Chat/Talk/Room/Settings/ChatBgSelectionView.swift b/SodaLive/Sources/Chat/Talk/Room/Settings/ChatBgSelectionView.swift index 6295822..c69da50 100644 --- a/SodaLive/Sources/Chat/Talk/Room/Settings/ChatBgSelectionView.swift +++ b/SodaLive/Sources/Chat/Talk/Room/Settings/ChatBgSelectionView.swift @@ -53,7 +53,7 @@ struct ChatBgSelectionView: View { .frame(alignment: .center) .frame(maxWidth: .infinity) .padding(.horizontal, 33.3) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift b/SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift index 9cc1c26..98e2db7 100644 --- a/SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift +++ b/SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift @@ -22,7 +22,7 @@ struct ContentAllByThemeView: View { Spacer() Text("최신순") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( Color(hex: "e2e2e2") .opacity(viewModel.sort == .NEWEST ? 1 : 0.5) @@ -34,7 +34,7 @@ struct ContentAllByThemeView: View { } Text("높은 가격순") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( Color(hex: "e2e2e2") .opacity(viewModel.sort == .PRICE_HIGH ? 1 : 0.5) @@ -46,7 +46,7 @@ struct ContentAllByThemeView: View { } Text("낮은 가격순") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( Color(hex: "e2e2e2") .opacity(viewModel.sort == .PRICE_LOW ? 1 : 0.5) @@ -64,16 +64,16 @@ struct ContentAllByThemeView: View { HStack(spacing: 0) { Text("전체") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) Text("\(viewModel.totalCount)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "ff5c49")) .padding(.leading, 8) Text("개") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) .padding(.leading, 2) diff --git a/SodaLive/Sources/Content/All/ContentAllView.swift b/SodaLive/Sources/Content/All/ContentAllView.swift index 577b8f7..da0b635 100644 --- a/SodaLive/Sources/Content/All/ContentAllView.swift +++ b/SodaLive/Sources/Content/All/ContentAllView.swift @@ -32,7 +32,7 @@ struct ContentAllView: View { Spacer() Text("최신순") - .font(.custom(Font.preMedium.rawValue, size: 16)) + .appFont(size: 16, weight: .medium) .foregroundColor( Color(hex: "e2e2e2") .opacity(viewModel.sort == .NEWEST ? 1 : 0.5) @@ -44,7 +44,7 @@ struct ContentAllView: View { } Text("인기순") - .font(.custom(Font.preMedium.rawValue, size: 16)) + .appFont(size: 16, weight: .medium) .foregroundColor( Color(hex: "e2e2e2") .opacity(viewModel.sort == .POPULARITY ? 1 : 0.5) diff --git a/SodaLive/Sources/Content/All/ContentNewAllItemView.swift b/SodaLive/Sources/Content/All/ContentNewAllItemView.swift index 2bc75cc..30fe495 100644 --- a/SodaLive/Sources/Content/All/ContentNewAllItemView.swift +++ b/SodaLive/Sources/Content/All/ContentNewAllItemView.swift @@ -41,11 +41,11 @@ struct ContentNewAllItemView: View { Image("ic_card_can_gray") Text("\(item.price)") - .font(.custom(Font.medium.rawValue, size: 8.5)) + .appFont(size: 8.5, weight: .medium) .foregroundColor(Color.white) } else { Text("무료") - .font(.custom(Font.medium.rawValue, size: 8.5)) + .appFont(size: 8.5, weight: .medium) .foregroundColor(Color.white) } } @@ -59,7 +59,7 @@ struct ContentNewAllItemView: View { HStack(spacing: 2) { Text(item.duration) - .font(.custom(Font.medium.rawValue, size: 8.5)) + .appFont(size: 8.5, weight: .medium) .foregroundColor(Color.white) } .padding(3) @@ -73,7 +73,7 @@ struct ContentNewAllItemView: View { .frame(width: width, height: width) Text(item.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "d2d2d2")) .frame(width: width, alignment: .leading) .multilineTextAlignment(.leading) @@ -96,7 +96,7 @@ struct ContentNewAllItemView: View { .onTapGesture { AppState.shared.setAppStep(step: .creatorDetail(userId: item.creatorId)) } Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) .lineLimit(1) } diff --git a/SodaLive/Sources/Content/All/ContentNewAllView.swift b/SodaLive/Sources/Content/All/ContentNewAllView.swift index 917e72f..bdceacf 100644 --- a/SodaLive/Sources/Content/All/ContentNewAllView.swift +++ b/SodaLive/Sources/Content/All/ContentNewAllView.swift @@ -20,7 +20,7 @@ struct ContentNewAllView: View { DetailNavigationBar(title: isFree ? "최신 무료 콘텐츠" : "최신 콘텐츠") Text("※ 최근 2주간 등록된 새로운 콘텐츠 입니다.") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.graybb) .padding(.horizontal, 13.3) .padding(.vertical, 8) @@ -37,16 +37,16 @@ struct ContentNewAllView: View { HStack(spacing: 0) { Text("전체") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) Text("\(viewModel.totalCount)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "ff5c49")) .padding(.leading, 8) Text("개") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) .padding(.leading, 2) } diff --git a/SodaLive/Sources/Content/All/ContentRankingAllView.swift b/SodaLive/Sources/Content/All/ContentRankingAllView.swift index e37af94..2bdfbdc 100644 --- a/SodaLive/Sources/Content/All/ContentRankingAllView.swift +++ b/SodaLive/Sources/Content/All/ContentRankingAllView.swift @@ -70,14 +70,14 @@ struct ContentRankingAllView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 8) { Text(item.themeStr) - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(2.6) .background(Color(hex: "28312b")) .cornerRadius(2.6) Text(item.duration) - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(Color(hex: "777777")) .padding(2.6) .background(Color(hex: "222222")) @@ -85,7 +85,7 @@ struct ContentRankingAllView: View { if item.isPointAvailable { Text("포인트") - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(.white) .padding(2.6) .background(Color(hex: "7849bc")) @@ -94,12 +94,12 @@ struct ContentRankingAllView: View { } Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color(hex: "777777")) .padding(.vertical, 8) Text(item.title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "d2d2d2")) .lineLimit(2) .padding(.top, 2.7) @@ -114,12 +114,12 @@ struct ContentRankingAllView: View { .frame(width: 17, height: 17) Text("\(item.price)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "909090")) } } else { Text("무료") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "ffffff")) .padding(.horizontal, 5.3) .padding(.vertical, 2.7) @@ -153,7 +153,7 @@ struct ContentRankingAllView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Box/ContentBoxTabView.swift b/SodaLive/Sources/Content/Box/ContentBoxTabView.swift index 85f9b0a..13c4369 100644 --- a/SodaLive/Sources/Content/Box/ContentBoxTabView.swift +++ b/SodaLive/Sources/Content/Box/ContentBoxTabView.swift @@ -14,7 +14,7 @@ struct ContentBoxTabView: View { var body: some View { Text(title) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(isSelected ? Color.button : Color.gray77) .padding(.vertical, 8.3) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Category/ContentListCategoryView.swift b/SodaLive/Sources/Content/Category/ContentListCategoryView.swift index 7b30021..b2253b0 100644 --- a/SodaLive/Sources/Content/Category/ContentListCategoryView.swift +++ b/SodaLive/Sources/Content/Category/ContentListCategoryView.swift @@ -19,7 +19,7 @@ struct ContentListCategoryView: View { ForEach(0.. 0 ? "답글 \(commentItem.replyCount)개" : "답글 쓰기") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) } } @@ -173,7 +173,7 @@ struct AudioContentCommentItemView: View { VStack(spacing: 10) { if commentItem.writerId == UserDefaults.int(forKey: .userId) { Text("수정") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray77) .onTapGesture { isModeModify = true @@ -185,7 +185,7 @@ struct AudioContentCommentItemView: View { commentItem.writerId == UserDefaults.int(forKey: .userId) { Text("삭제") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray77) .onTapGesture { isModeModify = false diff --git a/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentListView.swift b/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentListView.swift index cb5a86b..069e097 100644 --- a/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentListView.swift +++ b/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentListView.swift @@ -30,12 +30,12 @@ struct AudioContentCommentListView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("댓글") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.white) .padding(.leading, 13.3) Text("\(viewModel.totalCommentCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "909090")) .padding(.leading, 6.7) @@ -66,7 +66,7 @@ struct AudioContentCommentListView: View { } Text("비밀댓글") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(viewModel.isSecret ? Color.button : Color.grayee) .onTapGesture { viewModel.isSecret.toggle() @@ -88,7 +88,7 @@ struct AudioContentCommentListView: View { TextField("댓글을 입력해 보세요.", text: $viewModel.comment) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.default) @@ -195,7 +195,7 @@ struct AudioContentCommentListView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Content/Detail/Comment/AudioContentListReplyView.swift b/SodaLive/Sources/Content/Detail/Comment/AudioContentListReplyView.swift index f3f2df7..05cad04 100644 --- a/SodaLive/Sources/Content/Detail/Comment/AudioContentListReplyView.swift +++ b/SodaLive/Sources/Content/Detail/Comment/AudioContentListReplyView.swift @@ -30,7 +30,7 @@ struct AudioContentListReplyView: View { Image("ic_back") Text("답글") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.white) Spacer() @@ -58,7 +58,7 @@ struct AudioContentListReplyView: View { TextField("댓글을 입력해 보세요.", text: $viewModel.comment) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .accentColor(Color(hex: "3bb9f1")) .keyboardType(.default) diff --git a/SodaLive/Sources/Content/Detail/Comment/ContentDetailCommentView.swift b/SodaLive/Sources/Content/Detail/Comment/ContentDetailCommentView.swift index 2651b9a..67e315c 100644 --- a/SodaLive/Sources/Content/Detail/Comment/ContentDetailCommentView.swift +++ b/SodaLive/Sources/Content/Detail/Comment/ContentDetailCommentView.swift @@ -23,11 +23,11 @@ struct ContentDetailCommentView: View { VStack(alignment: .leading, spacing: 10.3) { HStack(spacing: 5.3) { Text("댓글") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.white) Text("\(commentCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray90) Spacer() @@ -39,7 +39,7 @@ struct ContentDetailCommentView: View { .frame(width: 20, height: 20) Text("비밀댓글") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(isSecret ? Color.button : Color.grayee) } .onTapGesture { @@ -64,7 +64,7 @@ struct ContentDetailCommentView: View { if commentCount > 0 { Text(commentList[0].comment) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) .lineLimit(1) .lineSpacing(8) @@ -74,7 +74,7 @@ struct ContentDetailCommentView: View { TextField("댓글을 입력해 보세요.", text: $comment) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.default) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailAnotherItemView.swift b/SodaLive/Sources/Content/Detail/ContentDetailAnotherItemView.swift index 8310eff..433f5b0 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailAnotherItemView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailAnotherItemView.swift @@ -29,7 +29,7 @@ struct ContentDetailAnotherItemView: View { HStack(spacing: 0) { Text(item.title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) .multilineTextAlignment(.leading) .lineLimit(1) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailCreatorProfileView.swift b/SodaLive/Sources/Content/Detail/ContentDetailCreatorProfileView.swift index c11bb35..faee9ad 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailCreatorProfileView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailCreatorProfileView.swift @@ -29,7 +29,7 @@ struct ContentDetailCreatorProfileView: View { .clipShape(Circle()) Text(creator.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) .padding(.horizontal, 5.3) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailInfoLimitedEditionView.swift b/SodaLive/Sources/Content/Detail/ContentDetailInfoLimitedEditionView.swift index dd19f89..44e0906 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailInfoLimitedEditionView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailInfoLimitedEditionView.swift @@ -19,7 +19,7 @@ struct ContentDetailInfoLimitedEditionView: View { VStack(alignment: .leading, spacing: 13.3) { HStack(spacing: 0) { Text("한정판") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) Spacer() @@ -36,12 +36,12 @@ struct ContentDetailInfoLimitedEditionView: View { .padding(.leading, 2.3) Text("\(totalContentCount)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayd2) .padding(.leading, 2.3) } else if (remainingContentCount <= 0) { Text("Sold Out") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayd2) .padding(.horizontal, 5.3) .padding(.vertical, 3.3) @@ -52,7 +52,7 @@ struct ContentDetailInfoLimitedEditionView: View { ) } else { Text("잔여수량") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayd2) Text("\(remainingContentCount)") @@ -87,7 +87,7 @@ struct ContentDetailInfoLimitedEditionView: View { .clipShape(Circle()) Text(buyer.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) .lineLimit(1) } diff --git a/SodaLive/Sources/Content/Detail/ContentDetailInfoView.swift b/SodaLive/Sources/Content/Detail/ContentDetailInfoView.swift index 4c3634a..2c114ff 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailInfoView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailInfoView.swift @@ -23,7 +23,7 @@ struct ContentDetailInfoView: View { HStack(spacing: 5.3) { if let _ = audioContent.releaseDate { Text("오픈예정") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .padding(.horizontal, 5.3) .padding(.vertical, 3.3) @@ -32,7 +32,7 @@ struct ContentDetailInfoView: View { } Text(audioContent.themeStr) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(.horizontal, 5.3) .padding(.vertical, 3.3) @@ -41,7 +41,7 @@ struct ContentDetailInfoView: View { if audioContent.isAdult { Text("19") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "e33621")) .padding(.horizontal, 5.3) .padding(.vertical, 3.3) @@ -57,13 +57,13 @@ struct ContentDetailInfoView: View { Image("ic_time_l") Text(remainingTime) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "909090")) } } Text(orderType == .KEEP ? "소장중" : "대여중") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor( orderType == .KEEP ? Color(hex: "b1ef2c") : @@ -101,7 +101,7 @@ struct ContentDetailInfoView: View { ) Text("\(audioContent.likeCount)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.horizontal, 13.3) @@ -114,7 +114,7 @@ struct ContentDetailInfoView: View { Image("ic_audio_content_share") Text("공유") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.horizontal, 13.3) @@ -130,7 +130,7 @@ struct ContentDetailInfoView: View { .frame(width: 13.3, height: 13.3) Text("후원") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.horizontal, 13.3) @@ -157,13 +157,13 @@ struct ContentDetailInfoView: View { VStack(spacing: 8) { if audioContent.tag.count > 0 { Text(audioContent.translated?.tags ?? audioContent.tag) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) .frame(maxWidth: .infinity, alignment: .leading) } Text(audioContent.translated?.detail ?? audioContent.detail) - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray90) .lineLimit(isExpandDescription ? nil : 3) .lineSpacing(5) @@ -175,7 +175,7 @@ struct ContentDetailInfoView: View { if isShowingPreviewAlert() { HStack(spacing: 0) { Text("미리듣기 중입니다.\n콘텐츠 구매 후 전체를 감상해 보세요.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) .lineSpacing(5) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailMenuView.swift b/SodaLive/Sources/Content/Detail/ContentDetailMenuView.swift index 4d3451f..9577b13 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailMenuView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailMenuView.swift @@ -35,7 +35,7 @@ struct ContentDetailMenuView: View { Image(isPin ? "ic_pin_cancel" : "ic_pin") Text(isPin ? "내 채널에 고정 취소" : "내 채널에 고정") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(.white) Spacer() @@ -52,7 +52,7 @@ struct ContentDetailMenuView: View { Image("ic_make_message") Text("수정") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(.white) Spacer() @@ -69,7 +69,7 @@ struct ContentDetailMenuView: View { Image("ic_trash_can") Text("삭제") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(.white) Spacer() @@ -84,7 +84,7 @@ struct ContentDetailMenuView: View { } else { HStack(spacing: 0) { Text("신고") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Content/Detail/ContentDetailMosaicView.swift b/SodaLive/Sources/Content/Detail/ContentDetailMosaicView.swift index 163059c..cf8204d 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailMosaicView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailMosaicView.swift @@ -17,12 +17,12 @@ struct ContentDetailMosaicView: View { Image("ic_notice_exclamation_mark") Text("본 콘텐츠는 만 19세 미만의 청소년이\n이용할 수 없습니다.\n본인인증 후 콘텐츠를 이용해 주세요.") - .font(.custom(Font.medium.rawValue, size: 18.7)) + .appFont(size: 18.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .padding(.top, 21.7) Text("본인인증") - .font(.custom(Font.medium.rawValue, size: 18.7)) + .appFont(size: 18.7, weight: .medium) .foregroundColor(Color.white) .padding(.horizontal, 13.3) .padding(.vertical, 8) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailOtherContentView.swift b/SodaLive/Sources/Content/Detail/ContentDetailOtherContentView.swift index f9c35ed..7cd8afa 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailOtherContentView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailOtherContentView.swift @@ -38,7 +38,7 @@ struct ContentDetailOtherContentView: View { Text("\(title)를 준비중입니다.\n조금만 기다려주세요.") .multilineTextAlignment(.center) - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) } .padding(13.3) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailPlayView.swift b/SodaLive/Sources/Content/Detail/ContentDetailPlayView.swift index 3fc15d4..75d4fce 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailPlayView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailPlayView.swift @@ -96,7 +96,7 @@ struct ContentDetailPlayView: View { .frame(width: 24, height: 24) Text(I18n.ContentDetail.preview) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color.white) } .padding(.vertical, 13.3) @@ -169,7 +169,7 @@ struct ContentDetailPlayView: View { .frame(width: 24, height: 24) Text(I18n.ContentDetail.noPreview) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "444446")) } .padding(.vertical, 13.3) @@ -217,7 +217,7 @@ struct ContentDetailPlayView: View { HStack(spacing: 0) { Text("\(getProgress()) / \(getDuration())") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Content/Detail/ContentDetailPreviousNextContentButtonView.swift b/SodaLive/Sources/Content/Detail/ContentDetailPreviousNextContentButtonView.swift index 6cd6cd0..6c965f3 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailPreviousNextContentButtonView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailPreviousNextContentButtonView.swift @@ -27,13 +27,13 @@ struct ContentDetailPreviousNextContentButtonView: View { VStack(alignment: .leading, spacing: 5.3) { Text(previousContent.title) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(.grayd2) .multilineTextAlignment(.leading) .lineLimit(2) Text("이전화") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.button) .multilineTextAlignment(.leading) .lineLimit(2) @@ -66,13 +66,13 @@ struct ContentDetailPreviousNextContentButtonView: View { VStack(alignment: .leading, spacing: 5.3) { Text(nextContent.title) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(.grayd2) .multilineTextAlignment(.leading) .lineLimit(2) Text("다음화") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.button) .multilineTextAlignment(.leading) .lineLimit(2) diff --git a/SodaLive/Sources/Content/Detail/ContentDetailView.swift b/SodaLive/Sources/Content/Detail/ContentDetailView.swift index 1e6584e..9486428 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailView.swift @@ -422,7 +422,7 @@ struct ContentDetailView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift b/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift index 8720506..93c3547 100644 --- a/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift +++ b/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift @@ -57,7 +57,7 @@ struct ContentOrderConfirmDialogView: View { VStack(alignment: .leading, spacing: 0) { Text(themeStr) - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(2.3) .background(Color(hex: "28312b")) @@ -82,13 +82,13 @@ struct ContentOrderConfirmDialogView: View { .clipShape(Circle()) Text(creatorNickname) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color.gray77) } .padding(.top, 6.7) Text(duration) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.gray77) .padding(.top, 6.7) } @@ -101,7 +101,7 @@ struct ContentOrderConfirmDialogView: View { .padding(.top, 21.3) Text("콘텐츠를 \(orderType == .RENTAL ? "대여" : "소장")하시겠습니까?") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.center) @@ -109,7 +109,7 @@ struct ContentOrderConfirmDialogView: View { if UserDefaults.int(forKey: .userId) != 17958 { Text("아래 금액이 차감됩니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.center) @@ -134,7 +134,7 @@ struct ContentOrderConfirmDialogView: View { if usablePoint > 0 && remainingCan > 0 { Text("+") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } diff --git a/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift b/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift index 7b3d896..55012b3 100644 --- a/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift +++ b/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift @@ -59,7 +59,7 @@ struct LiveRoomDonationDialogView: View { .foregroundColor(Color.grayee) Text("충전") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.main) .padding(.horizontal, 13.3) .padding(.vertical, 8) @@ -93,7 +93,7 @@ struct LiveRoomDonationDialogView: View { .frame(width: 20, height: 20) Text("비밀미션") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(isSecret ? Color.button : Color.grayee) } .onTapGesture { @@ -105,7 +105,7 @@ struct LiveRoomDonationDialogView: View { } TextField(isSecret ? "10캔 이상 입력하세요" : "1캔 이상 입력하세요", text: $donationCan) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .padding(13.3) .keyboardType(.numberPad) @@ -205,7 +205,7 @@ struct LiveRoomDonationDialogView: View { ) TextField("함께 보낼 \(isSecret ? "비밀 " : "")메시지 입력(최대 1000자)", text: $donationMessage) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .padding(13.3) .background(Color.gray30) @@ -272,7 +272,7 @@ struct LiveRoomDonationDialogView: View { Text(errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Main/ContentMainItemView.swift b/SodaLive/Sources/Content/Main/ContentMainItemView.swift index 792b8d4..a479091 100644 --- a/SodaLive/Sources/Content/Main/ContentMainItemView.swift +++ b/SodaLive/Sources/Content/Main/ContentMainItemView.swift @@ -36,7 +36,7 @@ struct ContentMainItemView: View { } Text(item.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayd2) .frame(width: 133.3, alignment: .leading) .multilineTextAlignment(.leading) @@ -59,7 +59,7 @@ struct ContentMainItemView: View { .onTapGesture { AppState.shared.setAppStep(step: .creatorDetail(userId: item.creatorId)) } Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.gray77) .lineLimit(1) } diff --git a/SodaLive/Sources/Content/Main/ContentMainView.swift b/SodaLive/Sources/Content/Main/ContentMainView.swift index 4656e09..a149ec6 100644 --- a/SodaLive/Sources/Content/Main/ContentMainView.swift +++ b/SodaLive/Sources/Content/Main/ContentMainView.swift @@ -41,7 +41,7 @@ struct ContentMainView: View { Image("ic_title_search_black") Text("채널명을 입력해 보세요") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray55) .keyboardType(.default) .padding(.horizontal, 13.3) @@ -145,7 +145,7 @@ struct ContentMainView: View { - 대표 이메일 : sodalive.official@gmail.com """) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.gray77) .padding(.top, 13.3) .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Content/Main/Curation/ContentMainCurationItemView.swift b/SodaLive/Sources/Content/Main/Curation/ContentMainCurationItemView.swift index b21d72c..117cfec 100644 --- a/SodaLive/Sources/Content/Main/Curation/ContentMainCurationItemView.swift +++ b/SodaLive/Sources/Content/Main/Curation/ContentMainCurationItemView.swift @@ -35,7 +35,7 @@ struct ContentMainCurationItemView: View { } Text(item.description) - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color(hex: "777777")) .padding(.top, 4) diff --git a/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentThemeView.swift b/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentThemeView.swift index e339543..370e305 100644 --- a/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentThemeView.swift +++ b/SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentThemeView.swift @@ -19,7 +19,7 @@ struct ContentMainNewContentThemeView: View { ForEach(0.. 0 ? "\(content.price)" : "무료") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.white) } .padding(4) @@ -92,7 +92,7 @@ struct ContentByChannelView: View { Spacer() Text(content.duration) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.white) .padding(4) .background(Color.gray33.opacity(0.7)) @@ -103,7 +103,7 @@ struct ContentByChannelView: View { } Text(content.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayd2) .lineLimit(1) @@ -117,7 +117,7 @@ struct ContentByChannelView: View { .clipped() Text(content.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(.gray77) } .onTapGesture { diff --git a/SodaLive/Sources/Content/Main/V2/ContentCreatorView.swift b/SodaLive/Sources/Content/Main/V2/ContentCreatorView.swift index 8b67d6d..d2c9691 100644 --- a/SodaLive/Sources/Content/Main/V2/ContentCreatorView.swift +++ b/SodaLive/Sources/Content/Main/V2/ContentCreatorView.swift @@ -31,7 +31,7 @@ struct ContentCreatorView: View { ) Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor( isSelected ? Color.button : diff --git a/SodaLive/Sources/Content/Main/V2/ContentMainNoItemView.swift b/SodaLive/Sources/Content/Main/V2/ContentMainNoItemView.swift index c5615a4..72057f9 100644 --- a/SodaLive/Sources/Content/Main/V2/ContentMainNoItemView.swift +++ b/SodaLive/Sources/Content/Main/V2/ContentMainNoItemView.swift @@ -15,7 +15,7 @@ struct ContentMainNoItemView: View { .frame(width: 60, height: 60) Text("마이페이지에서 본인인증을 해주세요") - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(.graybb) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Content/Main/V2/ContentMainViewV2.swift b/SodaLive/Sources/Content/Main/V2/ContentMainViewV2.swift index 409e0ac..2a8dd7e 100644 --- a/SodaLive/Sources/Content/Main/V2/ContentMainViewV2.swift +++ b/SodaLive/Sources/Content/Main/V2/ContentMainViewV2.swift @@ -151,12 +151,12 @@ struct ContentMainViewV2: View { VStack(alignment: .leading, spacing: 2.3) { Text(contentPlayerPlayManager.title) - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(2) Text(contentPlayerPlayManager.nickname) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.horizontal, 10.7) @@ -201,12 +201,12 @@ struct ContentMainViewV2: View { VStack(alignment: .leading, spacing: 2.3) { Text(contentPlayManager.title) - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(2) Text(contentPlayManager.nickname) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.horizontal, 10.7) diff --git a/SodaLive/Sources/Content/Main/V2/Free/All/ContentMainIntroduceCreatorAllView.swift b/SodaLive/Sources/Content/Main/V2/Free/All/ContentMainIntroduceCreatorAllView.swift index 6c498db..94d64e3 100644 --- a/SodaLive/Sources/Content/Main/V2/Free/All/ContentMainIntroduceCreatorAllView.swift +++ b/SodaLive/Sources/Content/Main/V2/Free/All/ContentMainIntroduceCreatorAllView.swift @@ -58,7 +58,7 @@ struct ContentMainIntroduceCreatorAllView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Main/V2/Free/ContentMainTabFreeView.swift b/SodaLive/Sources/Content/Main/V2/Free/ContentMainTabFreeView.swift index efccabb..401a072 100644 --- a/SodaLive/Sources/Content/Main/V2/Free/ContentMainTabFreeView.swift +++ b/SodaLive/Sources/Content/Main/V2/Free/ContentMainTabFreeView.swift @@ -84,7 +84,7 @@ struct ContentMainTabFreeView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Main/V2/Home/Category/ContentMainTabCategoryView.swift b/SodaLive/Sources/Content/Main/V2/Home/Category/ContentMainTabCategoryView.swift index 40b2256..e71c36e 100644 --- a/SodaLive/Sources/Content/Main/V2/Home/Category/ContentMainTabCategoryView.swift +++ b/SodaLive/Sources/Content/Main/V2/Home/Category/ContentMainTabCategoryView.swift @@ -20,7 +20,7 @@ struct ContentMainTabCategoryView: View { .frame(width: 43, height: 43) Text(title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.gray77) } .onTapGesture { diff --git a/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeNoticeView.swift b/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeNoticeView.swift index 7e6acca..437845a 100644 --- a/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeNoticeView.swift +++ b/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeNoticeView.swift @@ -15,13 +15,13 @@ struct ContentMainTabHomeNoticeView: View { var body: some View { HStack(spacing: 0) { Text(notice.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) Spacer() Text("자세히 >") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) .onTapGesture { onClick(notice) diff --git a/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeView.swift b/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeView.swift index e475a03..4f44604 100644 --- a/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeView.swift +++ b/SodaLive/Sources/Content/Main/V2/Home/ContentMainTabHomeView.swift @@ -58,7 +58,7 @@ struct ContentMainTabHomeView: View { Image("ic_title_search_black") Text("검색어를 2글자 이상 입력하세요") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray55) .keyboardType(.default) .padding(.horizontal, 13.3) @@ -262,7 +262,7 @@ struct ContentMainTabHomeView: View { - 대표 이메일 : sodalive.official@gmail.com """) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.gray77) .padding(.top, 30) } @@ -297,7 +297,7 @@ struct ContentMainTabHomeView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift b/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift index 38ffc2f..9eed9eb 100644 --- a/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift +++ b/SodaLive/Sources/Content/Main/V2/Home/Rank/ContentMainTabHomeRankCreatorView.swift @@ -107,14 +107,14 @@ struct ContentMainTabHomeRankCreatorView: View { } Text(creator.nickname) - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(1) .frame(width: 93.3) .padding(.top, 13.3) Text(creator.tags) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color.button) .lineLimit(1) .frame(width: 93.3) diff --git a/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift b/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift index a4c8240..a080e54 100644 --- a/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift +++ b/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift @@ -18,7 +18,7 @@ struct ContentMainReplayAllView: View { DetailNavigationBar(title: "새로운 라이브 다시듣기") Text("※ 최근 2주간 등록된 새로운 라이브 다시듣기 입니다.") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.graybb) .padding(.horizontal, 13.3) .padding(.vertical, 8) @@ -27,16 +27,16 @@ struct ContentMainReplayAllView: View { HStack(spacing: 0) { Text("전체") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) Text("\(viewModel.totalCount)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "ff5c49")) .padding(.leading, 8) Text("개") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) .padding(.leading, 2) } diff --git a/SodaLive/Sources/Content/Main/V2/Replay/ContentMainTabReplayView.swift b/SodaLive/Sources/Content/Main/V2/Replay/ContentMainTabReplayView.swift index c4d21f5..aabfedd 100644 --- a/SodaLive/Sources/Content/Main/V2/Replay/ContentMainTabReplayView.swift +++ b/SodaLive/Sources/Content/Main/V2/Replay/ContentMainTabReplayView.swift @@ -66,7 +66,7 @@ struct ContentMainTabReplayView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Main/V2/Series/Completed/CompletedSeriesView.swift b/SodaLive/Sources/Content/Main/V2/Series/Completed/CompletedSeriesView.swift index 0f94f08..b1cbd06 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/Completed/CompletedSeriesView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/Completed/CompletedSeriesView.swift @@ -24,16 +24,16 @@ struct CompletedSeriesView: View { HStack(alignment: .center, spacing: 0) { Text("전체") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.graye2) Text("\(viewModel.totalCount)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.mainRed) .padding(.leading, 6.7) Text("개") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.graye2) Spacer() @@ -66,7 +66,7 @@ struct CompletedSeriesView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Main/V2/Series/ContentMainNewOrRecommendSeriesView.swift b/SodaLive/Sources/Content/Main/V2/Series/ContentMainNewOrRecommendSeriesView.swift index 4e8886c..c72c962 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/ContentMainNewOrRecommendSeriesView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/ContentMainNewOrRecommendSeriesView.swift @@ -52,7 +52,7 @@ struct ContentMainNewOrRecommendSeriesItemView: View { .clipShape(RoundedRectangle(cornerRadius: 5)) Text(item.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) HStack(spacing: 5.3) { @@ -65,7 +65,7 @@ struct ContentMainNewOrRecommendSeriesItemView: View { .clipShape(Circle()) Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(.gray77) } .onTapGesture { diff --git a/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesGenreView.swift b/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesGenreView.swift index 3408606..db8bfb6 100644 --- a/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesGenreView.swift +++ b/SodaLive/Sources/Content/Main/V2/Series/ContentMainSeriesGenreView.swift @@ -19,7 +19,7 @@ struct ContentMainSeriesGenreView: View { ForEach(0.. 30 { @@ -90,7 +90,7 @@ struct ContentPlaylistCreateView: View { Spacer() Text("\(viewModel.desc.count)/40") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) .onChange(of: viewModel.desc) { newValue in if newValue.count > 40 { @@ -144,7 +144,7 @@ struct ContentPlaylistCreateView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentItemView.swift b/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentItemView.swift index 8b1b82b..e470ee6 100644 --- a/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentItemView.swift +++ b/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentItemView.swift @@ -34,7 +34,7 @@ struct PlaylistAddContentItemView: View { VStack(alignment: .leading, spacing: 2.6) { HStack(spacing: 8) { Text(item.themeStr) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(2.6) .background(Color(hex: "28312b")) @@ -42,7 +42,7 @@ struct PlaylistAddContentItemView: View { if let duration = item.duration { Text(duration) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color.gray77) .padding(2.6) .background(Color.gray22) @@ -51,7 +51,7 @@ struct PlaylistAddContentItemView: View { } Text(item.title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayd2) .lineLimit(2) .truncationMode(.tail) diff --git a/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift b/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift index 21816b0..02b573b 100644 --- a/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift +++ b/SodaLive/Sources/Content/Playlist/Create/PlaylistAddContentView.swift @@ -25,7 +25,7 @@ struct PlaylistAddContentView: View { Spacer() Text("닫기") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) .frame(minHeight: 48) .onTapGesture { isShowing = false } @@ -37,11 +37,11 @@ struct PlaylistAddContentView: View { HStack(alignment: .center, spacing: 5.3) { Text("전체") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.white) Text("\(viewModel.totalCount)개") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray90) } diff --git a/SodaLive/Sources/Content/Playlist/Create/PlaylistCreateContentView.swift b/SodaLive/Sources/Content/Playlist/Create/PlaylistCreateContentView.swift index 75b2d66..257a735 100644 --- a/SodaLive/Sources/Content/Playlist/Create/PlaylistCreateContentView.swift +++ b/SodaLive/Sources/Content/Playlist/Create/PlaylistCreateContentView.swift @@ -25,14 +25,14 @@ struct PlaylistCreateContentView: View { VStack(alignment: .leading, spacing: 6.7) { HStack(spacing: 8) { Text(content.category) - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(2.6) .background(Color(hex: "28312b")) .cornerRadius(2.6) Text(content.duration) - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(Color.gray77) .padding(2.6) .background(Color.gray22) @@ -40,7 +40,7 @@ struct PlaylistCreateContentView: View { } Text(content.title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayd2) .multilineTextAlignment(.leading) .lineLimit(3) diff --git a/SodaLive/Sources/Content/Playlist/Detail/ContentPlaylistDetailView.swift b/SodaLive/Sources/Content/Playlist/Detail/ContentPlaylistDetailView.swift index bdb5759..b0572c6 100644 --- a/SodaLive/Sources/Content/Playlist/Detail/ContentPlaylistDetailView.swift +++ b/SodaLive/Sources/Content/Playlist/Detail/ContentPlaylistDetailView.swift @@ -118,7 +118,7 @@ struct ContentPlaylistDetailView: View { .truncationMode(.tail) Text(response.desc.prefix(100)) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray90) .truncationMode(.tail) } @@ -126,13 +126,13 @@ struct ContentPlaylistDetailView: View { HStack(spacing: 0) { Text("만든 날짜 \(response.createdDate)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray90) Spacer() Text("\(response.contentCount)개") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } .padding(.top, 13.3) @@ -203,12 +203,12 @@ struct ContentPlaylistDetailView: View { VStack(alignment: .leading, spacing: 2.3) { Text(contentPlayerPlayManager.title) - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(2) Text(contentPlayerPlayManager.nickname) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.horizontal, 10.7) @@ -244,7 +244,7 @@ struct ContentPlaylistDetailView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) @@ -270,7 +270,7 @@ struct ContentPlaylistDetailView: View { HStack(spacing: 13.3) { Text("삭제") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Spacer() diff --git a/SodaLive/Sources/Content/Playlist/Detail/PlaylistContentItemView.swift b/SodaLive/Sources/Content/Playlist/Detail/PlaylistContentItemView.swift index fa1c436..03ceddc 100644 --- a/SodaLive/Sources/Content/Playlist/Detail/PlaylistContentItemView.swift +++ b/SodaLive/Sources/Content/Playlist/Detail/PlaylistContentItemView.swift @@ -27,14 +27,14 @@ struct PlaylistContentItemView: View { VStack(alignment: .leading, spacing: 2.6) { HStack(spacing: 8) { Text(item.category) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(2.6) .background(Color(hex: "28312b")) .cornerRadius(2.6) Text(item.duration) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color.gray77) .padding(2.6) .background(Color.gray22) @@ -42,7 +42,7 @@ struct PlaylistContentItemView: View { } Text(item.title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayd2) .lineLimit(2) .truncationMode(.tail) diff --git a/SodaLive/Sources/Content/Playlist/Modify/ContentPlaylistModifyView.swift b/SodaLive/Sources/Content/Playlist/Modify/ContentPlaylistModifyView.swift index 98600dc..478db2a 100644 --- a/SodaLive/Sources/Content/Playlist/Modify/ContentPlaylistModifyView.swift +++ b/SodaLive/Sources/Content/Playlist/Modify/ContentPlaylistModifyView.swift @@ -35,7 +35,7 @@ struct ContentPlaylistModifyView: View { Spacer() Text("수정") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) .frame(minHeight: 48) .onTapGesture { @@ -58,7 +58,7 @@ struct ContentPlaylistModifyView: View { Spacer() Text("\(viewModel.title.count)/30") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) .onChange(of: viewModel.title) { newValue in if newValue.count > 30 { @@ -91,7 +91,7 @@ struct ContentPlaylistModifyView: View { Spacer() Text("\(viewModel.desc.count)/40") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) .onChange(of: viewModel.desc) { newValue in if newValue.count > 40 { @@ -145,7 +145,7 @@ struct ContentPlaylistModifyView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Series/Content/SeriesContentAllView.swift b/SodaLive/Sources/Content/Series/Content/SeriesContentAllView.swift index 9ff118b..f54b67d 100644 --- a/SodaLive/Sources/Content/Series/Content/SeriesContentAllView.swift +++ b/SodaLive/Sources/Content/Series/Content/SeriesContentAllView.swift @@ -24,7 +24,7 @@ struct SeriesContentAllView: View { Spacer() Text("최신순") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( Color.graye2 .opacity(viewModel.sortType == .NEWEST ? 1 : 0.5) @@ -36,7 +36,7 @@ struct SeriesContentAllView: View { } Text("등록순") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( Color.graye2 .opacity(viewModel.sortType == .OLDEST ? 1 : 0.5) diff --git a/SodaLive/Sources/Content/Series/Content/SeriesContentListItemView.swift b/SodaLive/Sources/Content/Series/Content/SeriesContentListItemView.swift index 50263ab..bc7f1bb 100644 --- a/SodaLive/Sources/Content/Series/Content/SeriesContentListItemView.swift +++ b/SodaLive/Sources/Content/Series/Content/SeriesContentListItemView.swift @@ -26,7 +26,7 @@ struct SeriesContentListItemView: View { VStack(alignment: .leading, spacing: 2.7) { HStack(spacing: 8) { Text(item.duration) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color.gray77) .padding(2.7) .background(Color.gray22) @@ -34,7 +34,7 @@ struct SeriesContentListItemView: View { if item.isPointAvailable { Text("포인트") - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(.white) .padding(2.6) .background(Color(hex: "7849bc")) @@ -43,7 +43,7 @@ struct SeriesContentListItemView: View { } Text(item.title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayd2) } @@ -51,7 +51,7 @@ struct SeriesContentListItemView: View { if item.isOwned { Text("소장중") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray11) .padding(.horizontal, 5.3) .padding(.vertical, 2.7) @@ -59,7 +59,7 @@ struct SeriesContentListItemView: View { .cornerRadius(2.6) } else if item.isRented { Text("대여중") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.white) .padding(.horizontal, 5.3) .padding(.vertical, 2.7) @@ -70,12 +70,12 @@ struct SeriesContentListItemView: View { Image("ic_can") Text("\(item.price)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "909090")) } } else { Text("무료") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.white) .padding(.horizontal, 5.3) .padding(.vertical, 2.7) diff --git a/SodaLive/Sources/Content/Series/Detail/SeriesDetailIntroductionView.swift b/SodaLive/Sources/Content/Series/Detail/SeriesDetailIntroductionView.swift index 7d27c97..4a093cd 100644 --- a/SodaLive/Sources/Content/Series/Detail/SeriesDetailIntroductionView.swift +++ b/SodaLive/Sources/Content/Series/Detail/SeriesDetailIntroductionView.swift @@ -36,7 +36,7 @@ struct SeriesDetailIntroductionView: View { .foregroundColor(Color.grayee) Text(seriesDetail.displayIntroduction) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) .lineSpacing(4) } @@ -54,61 +54,61 @@ struct SeriesDetailIntroductionView: View { HStack(spacing: 30) { VStack(alignment: .leading, spacing: 13.3) { Text(I18n.SeriesDetail.genre) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) Text(I18n.SeriesDetail.ageLimit) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) if let _ = seriesDetail.writer { Text(I18n.SeriesDetail.writer) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) } if let _ = seriesDetail.studio { Text(I18n.SeriesDetail.studio) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) } Text(I18n.SeriesDetail.schedule) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) Text(I18n.SeriesDetail.releaseDate) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) } VStack(alignment: .leading, spacing: 13.3) { Text(seriesDetail.displayGenre) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.white) Text(seriesDetail.isAdult ? I18n.SeriesDetail.age19Plus : I18n.SeriesDetail.ageAll) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.white) if let writer = seriesDetail.writer { Text(writer) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.white) } if let studio = seriesDetail.studio { Text(studio) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.white) } Text(seriesDetail.publishedDaysOfWeek == "랜덤" ? I18n.SeriesDetail.random : "\(seriesDetail.publishedDaysOfWeek)") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.white) Text(seriesDetail.displayPublishedDate) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.white) } } @@ -123,21 +123,21 @@ struct SeriesDetailIntroductionView: View { HStack(spacing: 30) { VStack(alignment: .leading, spacing: 13.3) { Text(I18n.SeriesDetail.rentLabel) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) Text(I18n.SeriesDetail.buyLabel) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) } VStack(alignment: .leading, spacing: 13.3) { Text("\(calculatePriceInfo(seriesDetail.rentalMinPrice, seriesDetail.rentalMaxPrice)) \(I18n.SeriesDetail.daysSuffix(5))") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.button) Text("\(calculatePriceInfo(seriesDetail.minPrice, seriesDetail.maxPrice))") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.button) } } diff --git a/SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift b/SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift index 5bc299b..86f8926 100644 --- a/SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift +++ b/SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift @@ -84,7 +84,7 @@ struct SeriesDetailView: View { HStack(spacing: 5.3) { Text(seriesDetail.displayGenre) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(.horizontal, 5.3) .padding(.vertical, 3.3) @@ -93,7 +93,7 @@ struct SeriesDetailView: View { if seriesDetail.isAdult { Text("19세") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "f1291c")) .padding(.horizontal, 5.3) .padding(.vertical, 3.3) @@ -101,7 +101,7 @@ struct SeriesDetailView: View { .cornerRadius(2.6) } else { Text("전체연령가") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "d2d2d2")) .padding(.horizontal, 5.3) .padding(.vertical, 3.3) @@ -110,7 +110,7 @@ struct SeriesDetailView: View { } Text("\(seriesDetail.publishedDaysOfWeek) 연재") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "909090")) } .padding(.top, 8) @@ -142,7 +142,7 @@ struct SeriesDetailView: View { .frame(width: 26.7, height: 26.7) Text(seriesDetail.creator.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray90) } .onTapGesture { diff --git a/SodaLive/Sources/Content/Series/Main/ByGenre/SeriesMainByGenreView.swift b/SodaLive/Sources/Content/Series/Main/ByGenre/SeriesMainByGenreView.swift index 7885bae..bdc1dd7 100644 --- a/SodaLive/Sources/Content/Series/Main/ByGenre/SeriesMainByGenreView.swift +++ b/SodaLive/Sources/Content/Series/Main/ByGenre/SeriesMainByGenreView.swift @@ -63,7 +63,7 @@ struct SeriesMainByGenreView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Series/Main/DayOfWeek/SeriesMainDayOfWeekView.swift b/SodaLive/Sources/Content/Series/Main/DayOfWeek/SeriesMainDayOfWeekView.swift index f250fa9..e443edf 100644 --- a/SodaLive/Sources/Content/Series/Main/DayOfWeek/SeriesMainDayOfWeekView.swift +++ b/SodaLive/Sources/Content/Series/Main/DayOfWeek/SeriesMainDayOfWeekView.swift @@ -97,7 +97,7 @@ struct SeriesMainDayOfWeekView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Content/Series/Main/Home/SeriesMainHomeView.swift b/SodaLive/Sources/Content/Series/Main/Home/SeriesMainHomeView.swift index 6e55c02..c13a0d2 100644 --- a/SodaLive/Sources/Content/Series/Main/Home/SeriesMainHomeView.swift +++ b/SodaLive/Sources/Content/Series/Main/Home/SeriesMainHomeView.swift @@ -107,7 +107,7 @@ struct SeriesMainHomeView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/ContentView.swift b/SodaLive/Sources/ContentView.swift index f497f5a..e07ebb8 100644 --- a/SodaLive/Sources/ContentView.swift +++ b/SodaLive/Sources/ContentView.swift @@ -300,7 +300,7 @@ struct ContentView: View { Text(appState.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/CustomView/ExpandableTextView.swift b/SodaLive/Sources/CustomView/ExpandableTextView.swift index 0455b7c..75af3ba 100644 --- a/SodaLive/Sources/CustomView/ExpandableTextView.swift +++ b/SodaLive/Sources/CustomView/ExpandableTextView.swift @@ -44,7 +44,7 @@ struct ExpandableTextView: View { Image(isExpanded ? "ic_live_detail_top" : "ic_live_detail_bottom") Text(isExpanded ? "접기" : "펼치기") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) Spacer() } diff --git a/SodaLive/Sources/CustomView/IconAndTitleButton.swift b/SodaLive/Sources/CustomView/IconAndTitleButton.swift index ffcae1b..8a3d29a 100644 --- a/SodaLive/Sources/CustomView/IconAndTitleButton.swift +++ b/SodaLive/Sources/CustomView/IconAndTitleButton.swift @@ -18,7 +18,7 @@ struct IconAndTitleButton: View { Image(iconName) Text(title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "d2d2d2")) } .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/CustomView/IconAndTitleToggleButton.swift b/SodaLive/Sources/CustomView/IconAndTitleToggleButton.swift index e657ef0..d41ef0a 100644 --- a/SodaLive/Sources/CustomView/IconAndTitleToggleButton.swift +++ b/SodaLive/Sources/CustomView/IconAndTitleToggleButton.swift @@ -21,7 +21,7 @@ struct IconAndTitleToggleButton: View { Image(isChecked ? checkedIconName : normalIconName) Text("\(title)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "d2d2d2")) } .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Dialog/ApplyAuditionCompleteDialog.swift b/SodaLive/Sources/Dialog/ApplyAuditionCompleteDialog.swift index 6f2bcea..f442e57 100644 --- a/SodaLive/Sources/Dialog/ApplyAuditionCompleteDialog.swift +++ b/SodaLive/Sources/Dialog/ApplyAuditionCompleteDialog.swift @@ -26,7 +26,7 @@ struct ApplyAuditionCompleteDialog: View { .padding(.top, 26.7) Text("보이스온 오디션에 지원해 주셔서 감사합니다.") - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color.graybb) .padding(.top, 15) @@ -36,7 +36,7 @@ struct ApplyAuditionCompleteDialog: View { .padding(.top, 20) Text(roleName) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) .padding(.top, 10) diff --git a/SodaLive/Sources/Dialog/CommunityPostPurchaseDialog.swift b/SodaLive/Sources/Dialog/CommunityPostPurchaseDialog.swift index 5e915a7..2b783a9 100644 --- a/SodaLive/Sources/Dialog/CommunityPostPurchaseDialog.swift +++ b/SodaLive/Sources/Dialog/CommunityPostPurchaseDialog.swift @@ -28,7 +28,7 @@ struct CommunityPostPurchaseDialog: View { .padding(.top, 40) Text("게시글을\n확인하시겠습니까?") - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color.graybb) .multilineTextAlignment(.center) .padding(.top, 12) diff --git a/SodaLive/Sources/Dialog/CreatorFollowNotifyDialog.swift b/SodaLive/Sources/Dialog/CreatorFollowNotifyDialog.swift index 925dcdb..1b3e78a 100644 --- a/SodaLive/Sources/Dialog/CreatorFollowNotifyDialog.swift +++ b/SodaLive/Sources/Dialog/CreatorFollowNotifyDialog.swift @@ -88,7 +88,7 @@ struct CreatorFollowNotifyItem: View { Image(image) Text(title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Spacer() diff --git a/SodaLive/Sources/Dialog/LivePaymentDialog.swift b/SodaLive/Sources/Dialog/LivePaymentDialog.swift index 3dcfcf3..92c0ced 100644 --- a/SodaLive/Sources/Dialog/LivePaymentDialog.swift +++ b/SodaLive/Sources/Dialog/LivePaymentDialog.swift @@ -27,7 +27,7 @@ struct LivePaymentDialog: View { .foregroundColor(Color.graybb) Text(desc) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color.graybb) .multilineTextAlignment(.center) .lineSpacing(6) @@ -37,22 +37,22 @@ struct LivePaymentDialog: View { VStack(spacing: 13.3) { HStack(spacing: 6.7) { Text("- 시작 시각 : ") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) Text(startDateTime) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) } HStack(spacing: 6.7) { Text("- 현재 시각 :") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) .multilineTextAlignment(.leading) Text(nowDateTime) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) } } @@ -63,7 +63,7 @@ struct LivePaymentDialog: View { .padding(.top, 21.3) Text(desc) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color.graybb) .lineSpacing(6) .padding(.top, 21.3) diff --git a/SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift b/SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift index 86bc819..1d6cd01 100644 --- a/SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift +++ b/SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift @@ -31,7 +31,7 @@ struct LiveRoomPasswordDialog: View { .padding(.top, 40) Text("비공개 라이브의 입장 비밀번호를\n입력해 주세요.") - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .multilineTextAlignment(.center) .padding(.top, 12) diff --git a/SodaLive/Sources/Dialog/MemberProfileDialog.swift b/SodaLive/Sources/Dialog/MemberProfileDialog.swift index c67c93a..2620532 100644 --- a/SodaLive/Sources/Dialog/MemberProfileDialog.swift +++ b/SodaLive/Sources/Dialog/MemberProfileDialog.swift @@ -127,7 +127,7 @@ struct MemberProfileDialog: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Dialog/SodaDialog.swift b/SodaLive/Sources/Dialog/SodaDialog.swift index 5431fa5..4d310cf 100644 --- a/SodaLive/Sources/Dialog/SodaDialog.swift +++ b/SodaLive/Sources/Dialog/SodaDialog.swift @@ -49,7 +49,7 @@ struct SodaDialog: View { .padding(.top, 40) Text(desc) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color.graybb) .multilineTextAlignment(textAlignment) .padding(.top, 12) diff --git a/SodaLive/Sources/Explorer/ExplorerSectionView.swift b/SodaLive/Sources/Explorer/ExplorerSectionView.swift index abfeff3..66508e2 100644 --- a/SodaLive/Sources/Explorer/ExplorerSectionView.swift +++ b/SodaLive/Sources/Explorer/ExplorerSectionView.swift @@ -106,14 +106,14 @@ struct ExplorerSectionView: View { } Text(creator.nickname) - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .lineLimit(1) .frame(width: 93.3) .padding(.top, 13.3) Text(creator.tags) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .lineLimit(1) .frame(width: 93.3) diff --git a/SodaLive/Sources/Explorer/ExplorerView.swift b/SodaLive/Sources/Explorer/ExplorerView.swift index 7fa37d4..c22bfb3 100644 --- a/SodaLive/Sources/Explorer/ExplorerView.swift +++ b/SodaLive/Sources/Explorer/ExplorerView.swift @@ -21,7 +21,7 @@ struct ExplorerView: View { TextField("채널명을 입력해 보세요", text: $viewModel.channel) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .accentColor(Color(hex: "3bb9f1")) .keyboardType(.default) @@ -61,7 +61,7 @@ struct ExplorerView: View { .clipShape(Circle()) Text(channel.nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -73,7 +73,7 @@ struct ExplorerView: View { } } else { Text("검색 결과가 없습니다.") - .font(.custom(Font.medium.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .medium) .foregroundColor(.white) .padding(.top, 40) } @@ -103,7 +103,7 @@ struct ExplorerView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentItemView.swift index 943a75a..17b7722 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentItemView.swift @@ -41,12 +41,12 @@ struct CreatorCommunityCommentItemView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 6.7) { Text(commentItem.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray90) if commentItem.isSecret { Text("비밀댓글") - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.grayee) .padding(.horizontal, 4) .padding(.vertical, 2) @@ -56,7 +56,7 @@ struct CreatorCommunityCommentItemView: View { } Text(commentItem.date) - .font(.custom(Font.medium.rawValue, size: 10.3)) + .appFont(size: 10.3, weight: .medium) .foregroundColor(Color.gray52) .padding(.top, 4) } @@ -75,7 +75,7 @@ struct CreatorCommunityCommentItemView: View { TextField("댓글을 입력해 보세요.", text: $comment) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.default) @@ -105,7 +105,7 @@ struct CreatorCommunityCommentItemView: View { } else { VStack(alignment: .leading, spacing: 13.3) { Text(commentItem.comment) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .fixedSize(horizontal: false, vertical: true) .lineSpacing(8) @@ -120,7 +120,7 @@ struct CreatorCommunityCommentItemView: View { ) ) { Text(commentItem.replyCount > 0 ? "답글 \(commentItem.replyCount)개" : "답글 쓰기") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) } } @@ -141,7 +141,7 @@ struct CreatorCommunityCommentItemView: View { VStack(spacing: 10) { if commentItem.writerId == UserDefaults.int(forKey: .userId) { Text("수정") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color(hex: "777777")) .onTapGesture { isModeModify = true @@ -153,7 +153,7 @@ struct CreatorCommunityCommentItemView: View { commentItem.writerId == UserDefaults.int(forKey: .userId) { Text("삭제") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color(hex: "777777")) .onTapGesture { onClickDelete(commentItem.id) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentListView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentListView.swift index 9063cd3..9865263 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentListView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentListView.swift @@ -30,12 +30,12 @@ struct CreatorCommunityCommentListView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("댓글") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.white) .padding(.leading, 13.3) Text("\(viewModel.totalCommentCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "909090")) .padding(.leading, 6.7) @@ -66,7 +66,7 @@ struct CreatorCommunityCommentListView: View { } Text("비밀댓글") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(viewModel.isSecret ? Color.button : Color.grayee) .onTapGesture { viewModel.isSecret.toggle() @@ -87,7 +87,7 @@ struct CreatorCommunityCommentListView: View { TextField("댓글을 입력해 보세요.", text: $viewModel.comment) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .accentColor(Color(hex: "3bb9f1")) .keyboardType(.default) @@ -196,7 +196,7 @@ struct CreatorCommunityCommentListView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentReplyView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentReplyView.swift index a6ac22a..1874f9d 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentReplyView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentReplyView.swift @@ -30,7 +30,7 @@ struct CreatorCommunityCommentReplyView: View { Image("ic_back") Text("답글") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.white) Spacer() @@ -58,7 +58,7 @@ struct CreatorCommunityCommentReplyView: View { TextField("댓글을 입력해 보세요.", text: $viewModel.comment) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .accentColor(Color(hex: "3bb9f1")) .keyboardType(.default) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentView.swift index 2e0ac70..f1f09be 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Comment/CreatorCommunityCommentView.swift @@ -22,11 +22,11 @@ struct CreatorCommunityCommentView: View { VStack(alignment: .leading, spacing: 11) { HStack(spacing: 5.3) { Text("댓글") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.white) Text("\(commentCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "909090")) Spacer() @@ -40,7 +40,7 @@ struct CreatorCommunityCommentView: View { } Text("비밀댓글") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(isSecret ? Color.button : Color.grayee) .onTapGesture { isSecret.toggle() @@ -63,7 +63,7 @@ struct CreatorCommunityCommentView: View { .clipShape(Circle()) Text(comment.comment) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .lineLimit(1) .padding(.leading, 3) @@ -84,7 +84,7 @@ struct CreatorCommunityCommentView: View { TextField("댓글을 입력해 보세요.", text: $comment) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .accentColor(Color(hex: "3bb9f1")) .keyboardType(.default) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift index 9effcac..cc2ff46 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllItemView.swift @@ -55,7 +55,7 @@ struct CreatorCommunityAllItemView: View { VStack(alignment: .leading, spacing: 3) { Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Text(item.relativeTimeText()) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllView.swift index a628756..b67120d 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityAllView.swift @@ -152,7 +152,7 @@ struct CreatorCommunityAllView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) @@ -169,7 +169,7 @@ struct CreatorCommunityAllView: View { Text(playerManager.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityMenuView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityMenuView.swift index ad820cc..9e4d8c1 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityMenuView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/CreatorCommunityMenuView.swift @@ -32,7 +32,7 @@ struct CreatorCommunityMenuView: View { Image("ic_make_message") Text("수정") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(.white) Spacer() @@ -49,7 +49,7 @@ struct CreatorCommunityMenuView: View { Image("ic_trash_can") Text("삭제") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(.white) Spacer() @@ -64,7 +64,7 @@ struct CreatorCommunityMenuView: View { } else { HStack(spacing: 0) { Text("신고") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Report/CreatorCommunityReportView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Report/CreatorCommunityReportView.swift index 59f1c14..0306d6e 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Report/CreatorCommunityReportView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/All/Report/CreatorCommunityReportView.swift @@ -23,7 +23,7 @@ struct CreatorCommunityReportView: View { VStack(spacing: 13.3) { Text(I18n.Report.postReportTitle) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) VStack(spacing: 13.3) { @@ -35,7 +35,7 @@ struct CreatorCommunityReportView: View { .frame(width: 20, height: 20) Text(reason) - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color(hex: "909090")) Spacer() @@ -51,14 +51,14 @@ struct CreatorCommunityReportView: View { Spacer() Text(I18n.Common.cancel) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "9970ff")) .onTapGesture { isShowing = false } Text(I18n.Report.reportAction) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "9970ff")) .onTapGesture { if let selectedIndex = selectedIndex { diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityNoPostsItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityNoPostsItemView.swift index 603fbc0..5214b09 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityNoPostsItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityNoPostsItemView.swift @@ -20,7 +20,7 @@ struct CreatorCommunityNoPostsItemView: View { .foregroundColor(Color(hex: "eeeeee")) Text("게시 후에 게시물이 여기에 표시되고\n커뮤니티에 공개됩니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Modify/CreatorCommunityModifyView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Modify/CreatorCommunityModifyView.swift index 838ae40..b447dd4 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Modify/CreatorCommunityModifyView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Modify/CreatorCommunityModifyView.swift @@ -91,11 +91,11 @@ struct CreatorCommunityModifyView: View { HStack(alignment: .top, spacing: 0) { Text("※ ") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "777777")) Text("등록할 이미지가 없으면 이미지 없이 게시글만 등록 하셔도 됩니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "777777")) } .frame(maxWidth: .infinity, alignment: .leading) @@ -109,10 +109,10 @@ struct CreatorCommunityModifyView: View { Spacer() Text("\(viewModel.content.count)자") - .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "ff5c49")) + + .appFont(size: 13.3, weight: .medium) + .foregroundColor(Color(hex: "ff5c49")) Text(" / 최대 500자") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "777777")) } .padding(.top, 26.7) @@ -252,7 +252,7 @@ struct CreatorCommunityModifyView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityRecordingVoiceView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityRecordingVoiceView.swift index d0a949b..16ef05e 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityRecordingVoiceView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityRecordingVoiceView.swift @@ -78,7 +78,7 @@ struct CreatorCommunityRecordingVoiceView: View { Spacer() Text("삭제") - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color.graybb.opacity(0)) Spacer() @@ -101,7 +101,7 @@ struct CreatorCommunityRecordingVoiceView: View { Spacer() Text("삭제") - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color.graybb) .onTapGesture { soundManager.stopAudio() @@ -181,7 +181,7 @@ struct CreatorCommunityRecordingVoiceView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityWriteView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityWriteView.swift index a076763..978ec12 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityWriteView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/Write/CreatorCommunityWriteView.swift @@ -86,11 +86,11 @@ struct CreatorCommunityWriteView: View { HStack(alignment: .top, spacing: 0) { Text("※ ") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) Text("등록할 이미지가 없으면 이미지 없이 게시글만 등록 하셔도 됩니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) } .frame(maxWidth: .infinity) @@ -107,7 +107,7 @@ struct CreatorCommunityWriteView: View { } Text(fileName) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color.main) .padding(.vertical, 8) .background(Color.bg) @@ -122,7 +122,7 @@ struct CreatorCommunityWriteView: View { Text("※ 오디오 녹음은 최대 3분입니다") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) } .padding(.top, 24) @@ -136,10 +136,10 @@ struct CreatorCommunityWriteView: View { Spacer() Text("\(viewModel.content.count)자") - .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color.mainRed) + + .appFont(size: 13.3, weight: .medium) + .foregroundColor(Color.mainRed) Text(" / 최대 500자") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) } .padding(.top, 26.7) @@ -253,7 +253,7 @@ struct CreatorCommunityWriteView: View { Spacer() Text("캔") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.button) } .padding(.horizontal, 13.3) @@ -349,7 +349,7 @@ struct CreatorCommunityWriteView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkAllView.swift b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkAllView.swift index 398955c..2f42a3f 100644 --- a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkAllView.swift +++ b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkAllView.swift @@ -28,11 +28,11 @@ struct UserProfileFanTalkAllView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 6.7) { Text("응원") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) Text("\(viewModel.cheersTotalCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) } .padding(.top, 20) @@ -46,7 +46,7 @@ struct UserProfileFanTalkAllView: View { TextField("응원댓글을 입력하세요", text: $cheersContent) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.default) @@ -142,7 +142,7 @@ struct UserProfileFanTalkAllView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkCheersItemView.swift b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkCheersItemView.swift index 23c9dbe..cfb12f0 100644 --- a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkCheersItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkCheersItemView.swift @@ -47,7 +47,7 @@ struct UserProfileFanTalkCheersItemView: View { .foregroundColor(Color.white) Text("\(cheersItem.date)") - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color(hex: "78909C")) .padding(.top, 4) @@ -56,7 +56,7 @@ struct UserProfileFanTalkCheersItemView: View { TextField("", text: $cheers) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.grayee) .padding(13.3) .background(Color.gray23) @@ -93,7 +93,7 @@ struct UserProfileFanTalkCheersItemView: View { .padding(.top, 13.3) } else { Text("\(cheersItem.content)") - .font(.custom(Font.preMedium.rawValue, size: 16)) + .appFont(size: 16, weight: .medium) .foregroundColor(Color(hex: "B0BEC5")) .fixedSize(horizontal: false, vertical: true) .lineSpacing(8) @@ -105,7 +105,7 @@ struct UserProfileFanTalkCheersItemView: View { TextField("응원댓글에 답글을 남겨보세요!", text: $replyContent) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.grayee) .padding(13.3) .background(Color.gray23) @@ -137,7 +137,7 @@ struct UserProfileFanTalkCheersItemView: View { if cheersItem.replyList.count <= 0 { if userId == UserDefaults.int(forKey: .userId) { Text("답글쓰기") - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) .padding(.top, 18.3) .onTapGesture { @@ -148,7 +148,7 @@ struct UserProfileFanTalkCheersItemView: View { let reply = cheersItem.replyList[0] VStack(alignment: .leading, spacing: 8.3) { Text(reply.content) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.white) .frame(minWidth: 100) .padding(.horizontal, 6.7) @@ -160,12 +160,12 @@ struct UserProfileFanTalkCheersItemView: View { HStack(spacing: 6.7) { Text(reply.date) - .font(.custom(Font.preMedium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color.gray52) if userId == UserDefaults.int(forKey: .userId) { Text("답글 수정") - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) .onTapGesture { self.replyContent = reply.content @@ -197,7 +197,7 @@ struct UserProfileFanTalkCheersItemView: View { VStack(spacing: 10) { if cheersItem.memberId != UserDefaults.int(forKey: .userId) { Text("신고하기") - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray77) .onTapGesture { reportPopup(cheersItem.cheersId) @@ -207,7 +207,7 @@ struct UserProfileFanTalkCheersItemView: View { if cheersItem.memberId == UserDefaults.int(forKey: .userId) { Text("수정") - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray77) .onTapGesture { isModeModify = true @@ -220,7 +220,7 @@ struct UserProfileFanTalkCheersItemView: View { cheersItem.memberId == UserDefaults.int(forKey: .userId) { Text("삭제") - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray77) .onTapGesture { onClickDelete(cheersItem.cheersId) diff --git a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift index 9880f3b..768c7c1 100644 --- a/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift +++ b/SodaLive/Sources/Explorer/Profile/FanTalk/UserProfileFanTalkView.swift @@ -43,11 +43,11 @@ struct UserProfileFanTalkView: View { VStack(alignment: .leading, spacing: 20) { HStack(spacing: 6.7) { Text("응원") - .font(.custom(Font.preMedium.rawValue, size: 16)) + .appFont(size: 16, weight: .medium) .foregroundColor(Color.grayee) Text("\(cheers.totalCount)") - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray77) } @@ -55,7 +55,7 @@ struct UserProfileFanTalkView: View { TextField("응원댓글을 입력하세요", text: $cheersContent) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.default) diff --git a/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListItemView.swift b/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListItemView.swift index 835c41e..158926b 100644 --- a/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListItemView.swift @@ -34,7 +34,7 @@ struct FollowerListItemView: View { } Text(item.nickname) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .padding(.leading, 13.3) diff --git a/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListView.swift b/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListView.swift index efb5e64..c3528f8 100644 --- a/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListView.swift +++ b/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListView.swift @@ -30,7 +30,7 @@ struct FollowerListView: View { .foregroundColor(Color.grayee) Text("\(viewModel.totalCount)") - .font(.custom(Font.medium.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .medium) .foregroundColor(Color.button) Spacer() @@ -122,7 +122,7 @@ struct FollowerListView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileActivitySummaryView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileActivitySummaryView.swift index 7b2d298..907bdc9 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileActivitySummaryView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileActivitySummaryView.swift @@ -54,7 +54,7 @@ struct UserProfileActivitySummaryView: View { Spacer() VStack(spacing: 8) { Text(title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray90) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift index 4f5c17b..f664b77 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileDonationAllView.swift @@ -39,7 +39,7 @@ struct UserProfileDonationAllView: View { Spacer() Text("※ 비활성화하면 채널 내 후원랭킹이 표시되지 않으며,\n라이브 중에도 후원랭킹에 따른 뱃지가 반영되지 않습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "555555")) .multilineTextAlignment(.trailing) } @@ -105,16 +105,16 @@ struct UserProfileDonationAllView: View { HStack(alignment: .center, spacing: 0) { Text("전체") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Text("\(viewModel.totalCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "80d8ff")) .padding(.leading, 6.7) Text("개") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) Spacer() @@ -158,7 +158,7 @@ struct UserProfileDonationAllView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) @@ -225,14 +225,14 @@ struct UserProfileDonationAllItemView: View { let nickname = item.nickname.count > 10 ? "\(String(item.nickname.prefix(10)))..." : item.nickname Text(nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() if let donationCan = item.donationCan, donationCan > 0, withDonationCan { Text("\(donationCan) 캔") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } } diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift index 66908d8..4cff34b 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileDonationView.swift @@ -78,7 +78,7 @@ struct UserProfileDonationView: View { .frame(width: 73, height: 73) Text(item.nickname) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.grayee) .frame(width: 63) .lineLimit(1) diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileIntroduceView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileIntroduceView.swift index ac289d0..598de50 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileIntroduceView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileIntroduceView.swift @@ -18,7 +18,7 @@ struct UserProfileIntroduceView: View { .foregroundColor(Color(hex: "eeeeee")) Text(introduce) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "777777")) } .frame(width: screenSize().width - 26.7, alignment: .leading) diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileView.swift index e2abfee..4bf2c50 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileView.swift @@ -77,7 +77,7 @@ struct UserProfileView: View { } else { VStack(alignment: .leading, spacing: 9.3) { Text(I18n.MemberChannel.followerCount(creatorProfile.creator.notificationRecipientCount.comma())) - .font(.custom(Font.preMedium.rawValue, size: 16)) + .appFont(size: 16, weight: .medium) .foregroundColor(Color.white) } } @@ -98,7 +98,7 @@ struct UserProfileView: View { VStack(alignment: .leading, spacing: 8) { Text(I18n.Common.latestContent) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.button) .padding(.horizontal, 7) .padding(.vertical, 4) @@ -113,7 +113,7 @@ struct UserProfileView: View { HStack(spacing: 8) { if item.isScheduledToOpen { Text(I18n.Common.openScheduled) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .padding(2.6) .background(Color(hex: "003851")) @@ -121,14 +121,14 @@ struct UserProfileView: View { } Text(item.themeStr) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(2.6) .background(Color(hex: "28312b")) .cornerRadius(2.6) Text(item.duration!) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) .padding(2.6) .background(Color(hex: "222222")) @@ -136,7 +136,7 @@ struct UserProfileView: View { if item.isPointAvailable { Text(I18n.Common.points) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.white) .padding(2.6) .background(Color(hex: "7849bc")) @@ -145,7 +145,7 @@ struct UserProfileView: View { } Text(item.title) - .font(.custom(Font.preMedium.rawValue, size: 18)) + .appFont(size: 18, weight: .medium) .foregroundColor(Color.white) .multilineTextAlignment(.leading) .lineLimit(2) @@ -158,7 +158,7 @@ struct UserProfileView: View { .frame(width: 18, height: 18) Text("\(item.likeCount)") - .font(.custom(Font.preMedium.rawValue, size: 18)) + .appFont(size: 18, weight: .medium) .foregroundColor(Color(hex: "777777")) } @@ -168,7 +168,7 @@ struct UserProfileView: View { .frame(width: 18, height: 18) Text("\(item.commentCount)") - .font(.custom(Font.preMedium.rawValue, size: 18)) + .appFont(size: 18, weight: .medium) .foregroundColor(Color(hex: "777777")) } } @@ -545,7 +545,7 @@ struct UserProfileView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Follow/FollowCreatorView.swift b/SodaLive/Sources/Follow/FollowCreatorView.swift index 4b4a67f..34c4340 100644 --- a/SodaLive/Sources/Follow/FollowCreatorView.swift +++ b/SodaLive/Sources/Follow/FollowCreatorView.swift @@ -22,15 +22,15 @@ struct FollowCreatorView: View { HStack(spacing: 0) { Text("총") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Text(" \(viewModel.totalCount) ") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.mainRed3) Text("명") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Spacer() @@ -71,7 +71,7 @@ struct FollowCreatorView: View { } } else { Text("팔로우 중인 채널이 없습니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .frame(maxHeight: .infinity) } @@ -85,7 +85,7 @@ struct FollowCreatorView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/FortuneWheel/SpinWheelView.swift b/SodaLive/Sources/FortuneWheel/SpinWheelView.swift index 0ff98a2..cfd5819 100644 --- a/SodaLive/Sources/FortuneWheel/SpinWheelView.swift +++ b/SodaLive/Sources/FortuneWheel/SpinWheelView.swift @@ -62,7 +62,7 @@ struct SpinWheelView: View { ForEach(0.. 0 ? "\(item.price)" : "무료") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.white) } .padding(.horizontal, 7.3) @@ -74,11 +74,11 @@ struct LiveNowAllItemView: View { HStack(spacing: 2) { Text("잔여") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayee) Text("\(item.numberOfPeople - item.numberOfParticipate)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) } .padding(.horizontal, 4) @@ -94,14 +94,14 @@ struct LiveNowAllItemView: View { .frame(width: itemWidth, height: itemWidth * 144 / 102) Text("\(item.title)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .lineLimit(2) .fixedSize(horizontal: false, vertical: true) if item.tags.count > 0 { Text("\(item.tags.map { "#\($0)" }.joined(separator: " "))") - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.button) } @@ -120,7 +120,7 @@ struct LiveNowAllItemView: View { .clipShape(Circle()) Text("\(item.creatorNickname)") - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color.gray77) } } diff --git a/SodaLive/Sources/Live/Now/SectionLiveNowView.swift b/SodaLive/Sources/Live/Now/SectionLiveNowView.swift index 2f6714d..2668e7f 100644 --- a/SodaLive/Sources/Live/Now/SectionLiveNowView.swift +++ b/SodaLive/Sources/Live/Now/SectionLiveNowView.swift @@ -73,7 +73,7 @@ struct SectionLiveNowView: View { .frame(width: 60, height: 60) Text("마이페이지에서 본인인증을 하거나\n라이브를 예약하고 참여해보세요.") - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.center) @@ -91,7 +91,7 @@ struct SectionLiveNowView: View { Image("ic_refresh") Text("새로고침") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.vertical, 11) diff --git a/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift b/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift index a1e70d3..166b705 100644 --- a/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift +++ b/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift @@ -66,7 +66,7 @@ struct SectionRecommendChannelView: View { } Text(item.nickname) - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.graybb) .frame(width: screenSize().width * 0.18) .lineLimit(1) diff --git a/SodaLive/Sources/Live/Reservation/All/LiveReservationAllItemView.swift b/SodaLive/Sources/Live/Reservation/All/LiveReservationAllItemView.swift index fc95d66..1ac9abd 100644 --- a/SodaLive/Sources/Live/Reservation/All/LiveReservationAllItemView.swift +++ b/SodaLive/Sources/Live/Reservation/All/LiveReservationAllItemView.swift @@ -37,16 +37,16 @@ struct LiveReservationAllItemView: View { .parseUtcIsoDate()? .convertDateFormat(dateFormat: "yyyy.MM.dd EEE hh:mm a") ?? item.beginDateTimeUtc Text(beginDateText) - .font(.custom(Font.medium.rawValue, size: 9.3)) + .appFont(size: 9.3, weight: .medium) .foregroundColor(Color(hex: "ffd300")) Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .padding(.top, 10) Text(item.title) - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) .lineLimit(2) .padding(.top, 10) @@ -56,7 +56,7 @@ struct LiveReservationAllItemView: View { if item.isReservation { Text("예약완료") - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(Color(hex: "d2d2d2")) .padding(.horizontal, 7) .padding(.vertical, 4) @@ -64,7 +64,7 @@ struct LiveReservationAllItemView: View { .cornerRadius(10) } else { Text(item.price > 0 ? "\(item.price)캔" : "무료") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "e2e2e2").opacity(0.49)) .padding(.bottom, 6.7) } diff --git a/SodaLive/Sources/Live/Reservation/All/LiveReservationAllView.swift b/SodaLive/Sources/Live/Reservation/All/LiveReservationAllView.swift index dd65836..bdd8507 100644 --- a/SodaLive/Sources/Live/Reservation/All/LiveReservationAllView.swift +++ b/SodaLive/Sources/Live/Reservation/All/LiveReservationAllView.swift @@ -58,7 +58,7 @@ struct LiveReservationAllView: View { .frame(width: 60, height: 60) Text("지금 예약중인 라이브가 없습니다.\n다른 날짜의 라이브를 예약하고 참여해 보세요.") - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .multilineTextAlignment(.center) .lineSpacing(8) diff --git a/SodaLive/Sources/Live/Reservation/All/WeekCalendarView.swift b/SodaLive/Sources/Live/Reservation/All/WeekCalendarView.swift index 109a7ef..017dd51 100644 --- a/SodaLive/Sources/Live/Reservation/All/WeekCalendarView.swift +++ b/SodaLive/Sources/Live/Reservation/All/WeekCalendarView.swift @@ -16,7 +16,7 @@ struct WeekCalendarView: View { func DateItemView(index: Int, dateWithWeekDaySymbol: DateWithWeekDaySymbol) -> some View { VStack(spacing: 6.7) { Text(dateWithWeekDaySymbol.weekDaySymbol) - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor( self.selectedIndex == index ? .white : diff --git a/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift b/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift index 8ab110f..ae3bca6 100644 --- a/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift +++ b/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift @@ -41,29 +41,29 @@ struct LiveReservationCompleteView: View { VStack(spacing: 6.7) { HStack(spacing: 26.7) { Text("채널") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "777777")) Text(reservationCompleteData.nickname) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) HStack(spacing: 26.7) { Text("구매내역") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "777777")) Text(reservationCompleteData.title) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) HStack(spacing: 26.7) { Text("예약일자") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "777777")) let beginDateText = reservationCompleteData.beginDateTimeUtc @@ -71,18 +71,18 @@ struct LiveReservationCompleteView: View { .convertDateFormat(dateFormat: "yyyy.MM.dd E hh:mm a") ?? reservationCompleteData.beginDateTimeUtc Text(beginDateText) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) HStack(spacing: 26.7) { Text("라이브 비용") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "777777")) Text(reservationCompleteData.price) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) @@ -102,7 +102,7 @@ struct LiveReservationCompleteView: View { VStack(spacing: 13.3) { HStack(spacing: 0) { Text("보유캔") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "777777")) Spacer() @@ -112,14 +112,14 @@ struct LiveReservationCompleteView: View { .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) HStack(spacing: 0) { Text("결제캔") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "777777")) Spacer() @@ -129,14 +129,14 @@ struct LiveReservationCompleteView: View { .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) HStack(spacing: 0) { Text("잔여캔") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "777777")) Spacer() @@ -146,7 +146,7 @@ struct LiveReservationCompleteView: View { .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) diff --git a/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift b/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift index 47167a7..6ceac63 100644 --- a/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift +++ b/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift @@ -102,7 +102,7 @@ struct SectionLiveReservationView: View { .frame(width: 60, height: 60) Text("지금 예약중인 라이브가 없습니다.\n채널을 팔로잉 하고 라이브 알림을 받아 보세요.") - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift b/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift index c9fbd5b..0508065 100644 --- a/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift +++ b/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift @@ -48,7 +48,7 @@ struct LiveRoomCreateView: View { if viewModel.isShowGetRecentInfoButton { Text("최근 데이터 가져오기") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) .padding(.vertical, 8) .padding(.horizontal, 10.7) @@ -262,7 +262,7 @@ struct LiveRoomCreateView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) @@ -290,7 +290,7 @@ struct LiveRoomCreateView: View { TextField("라이브 제목을 입력하세요", text: $viewModel.title) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.default) @@ -334,7 +334,7 @@ struct LiveRoomCreateView: View { ForEach(viewModel.tags, id: \.self) { tag in HStack(spacing: 6.7) { Text(tag) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.white) Image("ic_circle_x") @@ -365,10 +365,10 @@ struct LiveRoomCreateView: View { Spacer() Text("\(viewModel.content.count)자") - .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color.mainRed) + + .appFont(size: 13.3, weight: .medium) + .foregroundColor(Color.mainRed) Text(" / 1000자") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) } @@ -449,7 +449,7 @@ struct LiveRoomCreateView: View { HStack(spacing: 13.3) { VStack(alignment: .leading, spacing: 6.7) { Text("예약 날짜") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Button(action: { @@ -457,7 +457,7 @@ struct LiveRoomCreateView: View { self.isShowSelectDateView = true }) { Text(viewModel.reservationDateString) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) .frame(width: buttonWidth, height: 48.7) .overlay( @@ -469,7 +469,7 @@ struct LiveRoomCreateView: View { VStack(alignment: .leading, spacing: 6.7) { Text("예약 시간") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Button(action: { @@ -477,7 +477,7 @@ struct LiveRoomCreateView: View { self.isShowSelectTimeView = true }) { Text(viewModel.reservationTimeString) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) .frame(width: buttonWidth, height: 48.7) .overlay( @@ -504,7 +504,7 @@ struct LiveRoomCreateView: View { .autocapitalization(.none) .disableAutocorrection(true) .multilineTextAlignment(.center) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.numberPad) @@ -642,7 +642,7 @@ struct LiveRoomCreateView: View { .autocapitalization(.none) .disableAutocorrection(true) .multilineTextAlignment(.center) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.numberPad) @@ -736,7 +736,7 @@ struct LiveRoomCreateView: View { Spacer() Text("캔") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.button) } .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift b/SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift index 4c3cc20..29b49aa 100644 --- a/SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift +++ b/SodaLive/Sources/Live/Room/Create/Tag/LiveRoomCreateTagView.swift @@ -34,7 +34,7 @@ struct LiveRoomCreateTagView: View { .foregroundColor(.white) Text("최대 3개까지 선택 가능합니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "777777")) } @@ -76,7 +76,7 @@ struct LiveRoomCreateTagView: View { } Text(tag.tag) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor( selectedTags.contains(tag.tag) ? Color.button : diff --git a/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift b/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift index 3444f7c..52ccec6 100644 --- a/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift +++ b/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift @@ -78,7 +78,7 @@ struct LiveDetailView: View { HStack(spacing: 5.3) { if room.isAdult { Text("19") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "e33621")) .padding(.horizontal, 5.3) .padding(.vertical, 3.3) @@ -96,7 +96,7 @@ struct LiveDetailView: View { HStack(spacing: 0) { let beginDateText = room.beginDateTimeUtc.parseUtcIsoDate()?.localizedDateTimeString() ?? room.beginDateTimeUtc Text(beginDateText) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) Spacer() @@ -155,7 +155,7 @@ struct LiveDetailView: View { VStack(spacing: 16.7) { HStack(spacing: 6.7) { Text(manager.nickname) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -199,7 +199,7 @@ struct LiveDetailView: View { HStack(alignment: .center, spacing: 0) { Text(manager.introduce) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) .lineLimit(3) .fixedSize(horizontal: false, vertical: true) @@ -213,7 +213,7 @@ struct LiveDetailView: View { .frame(width: 13.3, height: 13.3) Text("채널보기") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.white) .onTapGesture { AppState.shared.setAppStep(step: .creatorDetail(userId: manager.id)) @@ -240,13 +240,13 @@ struct LiveDetailView: View { .foregroundColor(Color(hex: "909090").opacity(0.5)) Text(room.tags.map { "#\($0)" }.joined(separator: " ")) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .frame(width: proxy.size.width - 26, alignment: .leading) .padding(.top, 26.7) Text(room.notice) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "777777")) .frame(width: proxy.size.width - 26, alignment: .leading) .padding(.top, 26.7) @@ -291,7 +291,7 @@ struct LiveDetailView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.center) @@ -354,7 +354,7 @@ struct LiveDetailView: View { } Text("예약삭제") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color(hex: "ff5c49")) .padding(5.3) .cornerRadius(10) @@ -416,17 +416,17 @@ struct LiveDetailView: View { if isExpandParticipantArea { HStack(spacing: 0) { Text(room.channelName.isNullOrBlank() ? "예약자" : "참가자") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) Spacer() Text("\(room.numberOfParticipants)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) Text("/\(room.numberOfParticipantsTotal)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) } .padding(.top, 16.7) @@ -448,7 +448,7 @@ struct LiveDetailView: View { .clipShape(Circle()) Text(user.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) .lineLimit(1) } @@ -479,11 +479,11 @@ struct LiveDetailView: View { HStack(spacing: 0) { Text("\(room.numberOfParticipants)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) Text("/\(room.numberOfParticipantsTotal)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) } } @@ -497,7 +497,7 @@ struct LiveDetailView: View { .frame(width: 20, height: 20) Text(isExpandParticipantArea ? "닫기" : "펼쳐보기") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.graybb) } .padding(.top, 13.3) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDialogView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDialogView.swift index ca37f6c..725658c 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDialogView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDialogView.swift @@ -25,7 +25,7 @@ struct LiveRoomDialogView: View { .frame(width: 36, height: 36) Text(content) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .padding(.horizontal, 26.7) @@ -35,7 +35,7 @@ struct LiveRoomDialogView: View { if let cancelTitle = cancelTitle, let cancelAction = cancelAction { Text(cancelTitle) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(.white) .padding(.horizontal, 8) .padding(.vertical, 8.3) @@ -51,7 +51,7 @@ struct LiveRoomDialogView: View { if let confirmTitle = confirmTitle, let confirmAction = confirmAction { Text(confirmTitle) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .padding(.horizontal, 8) .padding(.vertical, 8.3) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift index e883e53..bcda270 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageDialog.swift @@ -30,7 +30,7 @@ struct LiveRoomDonationMessageDialog: View { .foregroundColor(Color(hex: "eeeeee")) Text("(\(viewModel.donationMessageCount))") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -60,7 +60,7 @@ struct LiveRoomDonationMessageDialog: View { .padding(.top, 18.7) } else { Text("후원 히스토리가 없습니다.") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .padding(.top, 30) } @@ -80,7 +80,7 @@ struct LiveRoomDonationMessageDialog: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageItemView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageItemView.swift index 0ceadb4..0a15c54 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageItemView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationMessageItemView.swift @@ -17,17 +17,17 @@ struct LiveRoomDonationMessageItemView: View { HStack(alignment: .top, spacing: 0) { VStack(alignment: .leading, spacing: 8) { Text("\(message.nickname)님이") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) if !message.canMessage.trimmingCharacters(in: .whitespaces).isEmpty { Text("\(message.canMessage)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) } Text("'\(message.donationMessage)'") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) } diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift index 5202e10..2f886d7 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift @@ -34,16 +34,16 @@ struct LiveRoomDonationRankingDialog: View { HStack(spacing: 0) { Text("전체") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) Text(" \(donationStatus.totalCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) .padding(.leading, 6.7) Text("명") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) Spacer() @@ -79,7 +79,7 @@ struct LiveRoomDonationRankingDialog: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift index 31d0615..79128e3 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift @@ -61,7 +61,7 @@ struct LiveRoomDonationRankingItemView: View { let nickname = item.nickname.count > 10 ? "\(String(item.nickname.prefix(10)))..." : item.nickname Text(nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -70,11 +70,11 @@ struct LiveRoomDonationRankingItemView: View { if item.can > 0 { HStack(spacing: 4) { Text("\(item.can)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) Text("캔") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } } @@ -82,7 +82,7 @@ struct LiveRoomDonationRankingItemView: View { if item.secretCan > 0 { HStack(spacing: 4) { Text("비밀") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray11) .padding(.horizontal, 3.3) .padding(.vertical, 2.7) @@ -90,11 +90,11 @@ struct LiveRoomDonationRankingItemView: View { .cornerRadius(2.7) Text("\(item.secretCan)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "fedc00")) Text("캔") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } } diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift index 16eff79..2de588c 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift @@ -20,43 +20,43 @@ struct LiveRoomDonationRankingTotalCanView: View { if totalSecretCan > 0 { Text(" (") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayd2) Text("일반") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) Text("/") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayd2) Text("비밀") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "fedc00")) Text(")") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayd2) } Spacer() Text("\(totalCan)") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.button) if totalSecretCan > 0 { Text("/") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.white) Text("\(totalSecretCan)") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color(hex: "fedc00")) } Text("캔") - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color.graybb) .padding(.leading, 4) } diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift index fe22a99..d6abfbd 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingDialog.swift @@ -41,11 +41,11 @@ struct LiveRoomHeartRankingDialog: View { Spacer() Text("\(heartStatus.totalHeart)") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.button) Text("하트") - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color.graybb) .padding(.leading, 4) } @@ -57,16 +57,16 @@ struct LiveRoomHeartRankingDialog: View { HStack(spacing: 0) { Text("전체") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) Text(" \(heartStatus.totalCount)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) .padding(.leading, 6.7) Text("명") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) Spacer() @@ -102,7 +102,7 @@ struct LiveRoomHeartRankingDialog: View { Text(errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift index c2950a7..63f4b58 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomHeartRankingItemView.swift @@ -61,7 +61,7 @@ struct LiveRoomHeartRankingItemView: View { let nickname = item.nickname.count > 10 ? "\(String(item.nickname.prefix(10)))..." : item.nickname Text(nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Spacer() @@ -70,11 +70,11 @@ struct LiveRoomHeartRankingItemView: View { if item.heart > 0 { HStack(spacing: 4) { Text("\(item.heart)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) Text("하트") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } } diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift index de1df37..09d448f 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomInfoEditDialog.swift @@ -137,7 +137,7 @@ struct LiveRoomInfoEditDialog: View { HStack(spacing: 0) { Text("19세 이상") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Spacer() @@ -258,7 +258,7 @@ struct LiveRoomInfoEditDialog: View { TextField("라이브 제목을 입력하세요", text: $title) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .accentColor(Color.button) .keyboardType(.default) @@ -283,10 +283,10 @@ struct LiveRoomInfoEditDialog: View { Spacer() Text("\(notice.count)자") - .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color.mainRed) + + .appFont(size: 13.3, weight: .medium) + .foregroundColor(Color.mainRed) Text(" / 1000자") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) } diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift index d9f7dba..aa32856 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift @@ -39,12 +39,12 @@ struct LiveRoomNoChattingDialogView: View { .frame(width: 26.7, height: 26.7) Text(nickname) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) } Text("3분간 채팅금지를 하겠습니까?") - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) HStack(spacing: 13.3) { diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift index 9f110a6..c421799 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift @@ -52,7 +52,7 @@ struct LiveRoomProfileDialog: View { if isSpeaker { if profileInfo.role == .LISTENER, let onClickInviteSpeaker = onClickInviteSpeaker { Text("스피커로 초대") - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(.button) .padding(.horizontal, 15.4) .padding(.vertical, 8.3) @@ -67,7 +67,7 @@ struct LiveRoomProfileDialog: View { if (memberId == creatorId || memberId == profileInfo.id) && profileInfo.id != creatorId && profileInfo.role == .SPEAKER, let onClickChangeListener = onClickChangeListener { Text("리스너로 변경") - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(.button) .padding(.horizontal, 15.4) .padding(.vertical, 8.3) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift index 49ecbc9..3d2593b 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift @@ -22,14 +22,14 @@ struct LiveRoomProfileItemTitleView: View { if let count = count { Text("\(count)") - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color.button) .padding(.leading, 6.7) } if let totalCount = totalCount { Text("/\(totalCount > 5 ? 5 : totalCount - 1)") - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color.graybb) } @@ -65,7 +65,7 @@ struct LiveRoomProfileItemMasterView: View { .padding(.leading, 16.7) Text(nickname) - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.grayee) .padding(.leading, 4) } @@ -114,7 +114,7 @@ struct LiveRoomProfileItemUserView: View { .padding(.leading, 16.7) Text(nickname) - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(2) .multilineTextAlignment(.leading) @@ -122,7 +122,7 @@ struct LiveRoomProfileItemUserView: View { .padding(.trailing, 10) } else { Text(nickname) - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(2) .multilineTextAlignment(.leading) @@ -133,7 +133,7 @@ struct LiveRoomProfileItemUserView: View { if role == .LISTENER && isStaff { Text("스피커로 초대") - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(.white) .padding(.horizontal, 5.5) .padding(.vertical, 12) @@ -150,7 +150,7 @@ struct LiveRoomProfileItemUserView: View { if role == .SPEAKER && (userId == UserDefaults.int(forKey: .userId) || isStaff) { Text("리스너로 변경") - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(.white) .padding(.horizontal, 5.5) .padding(.vertical, 12) @@ -163,7 +163,7 @@ struct LiveRoomProfileItemUserView: View { if role != .MANAGER && creatorId == UserDefaults.int(forKey: .userId) { Text("채금") - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(.white) .padding(.horizontal, 5.5) .padding(.vertical, 12) diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift index 1411d9f..649eb0d 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift @@ -178,12 +178,12 @@ struct LiveRoomProfilesDialogView: View { .foregroundColor(Color.grayee) Text("\(roomInfo.participantsCount)") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.button) .padding(.leading, 6.7) Text("/\(roomInfo.totalAvailableParticipantsCount)") - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.graybb) Spacer() diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift index 1a5d30d..8a88fca 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift @@ -49,7 +49,7 @@ struct LiveRoomUserProfileDialogView: View { .foregroundColor(Color.grayee) Text(userProfile.gender) - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(.white) .padding(.horizontal, 5.3) .padding(.vertical, 3) @@ -176,7 +176,7 @@ struct LiveRoomUserProfileDialogView: View { if let _ = userProfile.isFollowing, !userProfile.tags.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { Text(userProfile.tags) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) .lineSpacing(3) .padding(.top, 21.3) @@ -184,7 +184,7 @@ struct LiveRoomUserProfileDialogView: View { if let _ = userProfile.isFollowing, !userProfile.introduce.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { Text(userProfile.introduce) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) .lineLimit(introduceLineLimit) .lineSpacing(3) diff --git a/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift b/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift index c7b969b..b35076d 100644 --- a/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift +++ b/SodaLive/Sources/Live/Room/Edit/LiveRoomEditView.swift @@ -86,7 +86,7 @@ struct LiveRoomEditView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.center) @@ -113,7 +113,7 @@ struct LiveRoomEditView: View { TextField("라이브 제목을 입력하세요", text: $viewModel.title) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .accentColor(Color(hex: "3bb9f1")) .keyboardType(.default) @@ -138,10 +138,10 @@ struct LiveRoomEditView: View { Spacer() Text("\(viewModel.notice.count)자") - .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "ff5c49")) + + .appFont(size: 13.3, weight: .medium) + .foregroundColor(Color(hex: "ff5c49")) Text(" / 1000자") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "777777")) } @@ -162,7 +162,7 @@ struct LiveRoomEditView: View { HStack(spacing: 13.3) { VStack(alignment: .leading, spacing: 6.7) { Text("예약 날짜") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Button(action: { @@ -170,7 +170,7 @@ struct LiveRoomEditView: View { self.isShowSelectDateView = true }) { Text(viewModel.reservationDateString) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .frame(width: buttonWidth, height: 48.7) .overlay( @@ -182,7 +182,7 @@ struct LiveRoomEditView: View { VStack(alignment: .leading, spacing: 6.7) { Text("예약 시간") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Button(action: { @@ -190,7 +190,7 @@ struct LiveRoomEditView: View { self.isShowSelectTimeView = true }) { Text(viewModel.reservationTimeString) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .frame(width: buttonWidth, height: 48.7) .overlay( @@ -217,7 +217,7 @@ struct LiveRoomEditView: View { .autocapitalization(.none) .disableAutocorrection(true) .multilineTextAlignment(.center) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .accentColor(Color(hex: "3bb9f1")) .keyboardType(.numberPad) diff --git a/SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift b/SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift index 7dc65af..70ef863 100644 --- a/SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift +++ b/SodaLive/Sources/Live/Room/Menu/LiveRoomMenuSelectView.swift @@ -24,7 +24,7 @@ struct LiveRoomMenuSelectView: View { HStack(spacing: 0) { Text("메뉴를 활성화 하시겠습니까?") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift b/SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift index 5309e2c..66ae1b6 100644 --- a/SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift +++ b/SodaLive/Sources/Live/Room/Menu/MenuSettingsView.swift @@ -88,7 +88,7 @@ struct MenuSettingsView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsOptionView.swift b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsOptionView.swift index 7208b9e..2aa3517 100644 --- a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsOptionView.swift +++ b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsOptionView.swift @@ -19,14 +19,14 @@ struct RouletteSettingsOptionView: View { VStack(spacing: 6.7) { HStack(spacing: 0) { Text("옵션 \(index + 1)") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() if index > 1 { Text("삭제") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "ff5c49")) .onTapGesture { onClickDelete() } } @@ -36,7 +36,7 @@ struct RouletteSettingsOptionView: View { TextField("옵션을 입력하세요", text: $option.title) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .keyboardType(.default) .padding(.horizontal, 13.3) @@ -49,7 +49,7 @@ struct RouletteSettingsOptionView: View { TextField("0.00", text: $option.percentage) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .keyboardType(.decimalPad) .onChange(of: option.percentage) { newValue in @@ -61,7 +61,7 @@ struct RouletteSettingsOptionView: View { } Text("%") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift index d9954ee..c017c63 100644 --- a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift +++ b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift @@ -97,7 +97,7 @@ struct RouletteSettingsView: View { )) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .keyboardType(.numberPad) .padding(.horizontal, 13.3) @@ -122,7 +122,7 @@ struct RouletteSettingsView: View { HStack(spacing: 0) { Text("※ 룰렛 옵션은 최소 2개,\n최대 10개까지 설정할 수 있습니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.mainRed) Spacer() @@ -135,13 +135,13 @@ struct RouletteSettingsView: View { HStack(spacing: 0) { Text("옵션 확률 합계") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) Spacer() Text("( \(String(format: "%.2f", viewModel.totalPercentage))% )") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) } .padding(.top, 21.3) @@ -224,7 +224,7 @@ struct RouletteSettingsView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift b/SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift index fd71e79..e6d93f3 100644 --- a/SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift +++ b/SodaLive/Sources/Live/Room/Routlette/RoulettePreviewDialog.swift @@ -101,7 +101,7 @@ struct RoulettePreviewDialog: View { .foregroundColor(Color(hex: "e2e2e2")) Text("\(previewList[selectedRoulette.rawValue].items[index].title) (\(previewList[selectedRoulette.rawValue].items[index].percent))") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) } } diff --git a/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomNewChatView.swift b/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomNewChatView.swift index 2d69078..ad99b3c 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomNewChatView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomNewChatView.swift @@ -18,7 +18,7 @@ struct LiveRoomNewChatView: View { HStack(spacing: 6.7) { Image("ic_bottom_white") Text("새로운 채팅") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } .padding(.vertical, 8) diff --git a/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextButton.swift b/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextButton.swift index 39e7749..7287679 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextButton.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextButton.swift @@ -19,7 +19,7 @@ struct LiveRoomOverlayStrokeTextButton: View { var body: some View { Text(text) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(textColor) .padding(.horizontal, 8) .padding(.vertical, 6) diff --git a/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextToggleButton.swift b/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextToggleButton.swift index 5e6f88b..ec6dc23 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextToggleButton.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/Button/LiveRoomOverlayStrokeTextToggleButton.swift @@ -26,7 +26,7 @@ struct LiveRoomOverlayStrokeTextToggleButton: View { var body: some View { Text(isOn ? onText : offText != nil && offText?.count ?? 0 > 0 ? offText! : onText) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(isOn ? onTextColor : offTextColor) .padding(.horizontal, 8) .padding(.vertical, 6) diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift index effab73..1fb19b2 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift @@ -72,7 +72,7 @@ struct LiveRoomInfoCreatorView: View { HStack(spacing: 5.3) { Text(creatorNickname) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.gray77) .lineLimit(1) diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift index d7d6255..9666f7b 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift @@ -171,7 +171,7 @@ struct LiveRoomInfoGuestView: View { .frame(width: 12, height: 12) Text("\(totalHeart)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.graybb) } .padding(.horizontal, 11) @@ -188,7 +188,7 @@ struct LiveRoomInfoGuestView: View { .frame(width: 12, height: 12) Text("\(totalDonationCan)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.graybb) } .padding(.horizontal, 11) diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift index a67310f..f088c13 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift @@ -169,7 +169,7 @@ struct LiveRoomInfoHostView: View { .frame(width: 12, height: 12) Text("\(totalHeart)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.graybb) } .padding(.horizontal, 11) @@ -186,7 +186,7 @@ struct LiveRoomInfoHostView: View { .frame(width: 12, height: 12) Text("\(totalDonationCan)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.graybb) } .padding(.horizontal, 11) @@ -199,7 +199,7 @@ struct LiveRoomInfoHostView: View { HStack(spacing: 6.7) { Text(I18n.LiveRoom.participants) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.graybb) Text("\(participantsCount)") diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift index 972e2c7..21d060b 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift @@ -48,7 +48,7 @@ struct LiveRoomInfoSpeakerView: View { ) Text(nickname) - .font(.custom(Font.medium.rawValue, fixedSize: 8.7)) + .appFont(size: 8.7, weight: .medium) .foregroundColor(.gray77) .lineLimit(1) .truncationMode(.tail) diff --git a/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift b/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift index fd5a9af..d78d090 100644 --- a/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift +++ b/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift @@ -445,7 +445,7 @@ struct LiveRoomViewV2: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) @@ -626,7 +626,7 @@ struct LiveRoomViewV2: View { Text(viewModel.reportMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Main/EventPopupDialogView.swift b/SodaLive/Sources/Main/EventPopupDialogView.swift index 5516533..ae038bf 100644 --- a/SodaLive/Sources/Main/EventPopupDialogView.swift +++ b/SodaLive/Sources/Main/EventPopupDialogView.swift @@ -39,7 +39,7 @@ struct EventPopupDialogView: View { HStack(spacing: 0) { Text("다시보지 않기") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .onTapGesture { UserDefaults.set(eventPopup.id, forKey: .notShowingEventPopupId) @@ -49,7 +49,7 @@ struct EventPopupDialogView: View { Spacer() Text("닫기") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .onTapGesture { AppState.shared.eventPopup = nil } } diff --git a/SodaLive/Sources/Main/Home/HomeView.swift b/SodaLive/Sources/Main/Home/HomeView.swift index 1b610d9..a9934c4 100644 --- a/SodaLive/Sources/Main/Home/HomeView.swift +++ b/SodaLive/Sources/Main/Home/HomeView.swift @@ -65,12 +65,12 @@ struct HomeView: View { VStack(alignment: .leading, spacing: 2.3) { Text(contentPlayerPlayManager.title) - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(2) Text(contentPlayerPlayManager.nickname) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.horizontal, 10.7) @@ -115,12 +115,12 @@ struct HomeView: View { VStack(alignment: .leading, spacing: 2.3) { Text(contentPlayManager.title) - .font(.custom(Font.medium.rawValue, size: 13)) + .appFont(size: 13, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(2) Text(contentPlayManager.nickname) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.grayd2) } .padding(.horizontal, 10.7) diff --git a/SodaLive/Sources/Message/MessageFilterTabView.swift b/SodaLive/Sources/Message/MessageFilterTabView.swift index 65aaa72..b0985de 100644 --- a/SodaLive/Sources/Message/MessageFilterTabView.swift +++ b/SodaLive/Sources/Message/MessageFilterTabView.swift @@ -14,7 +14,7 @@ struct MessageFilterTabView: View { var body: some View { HStack(spacing: 6.7) { Text("받은 메시지") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: currentFilterTab == .receive ? "3bb9f1" : "777777")) .padding(.horizontal, 25) .padding(.vertical, 10.7) @@ -32,7 +32,7 @@ struct MessageFilterTabView: View { } Text("보낸 메시지") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: currentFilterTab == .sent ? "3bb9f1" : "777777")) .padding(.horizontal, 25) .padding(.vertical, 10.7) @@ -50,7 +50,7 @@ struct MessageFilterTabView: View { } Text("보관함") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: currentFilterTab == .keep ? "3bb9f1" : "777777")) .padding(.horizontal, 25) .padding(.vertical, 10.7) diff --git a/SodaLive/Sources/Message/MessageView.swift b/SodaLive/Sources/Message/MessageView.swift index 43559ac..5f53987 100644 --- a/SodaLive/Sources/Message/MessageView.swift +++ b/SodaLive/Sources/Message/MessageView.swift @@ -22,7 +22,7 @@ struct MessageView: View { Tab() Text("※ 보관하지 않은 받은 메시지는 3일 후, 자동 삭제됩니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .padding(.top, 20) switch viewModel.currentTab { @@ -51,7 +51,7 @@ struct MessageView: View { }) { VStack(spacing: 0) { Text("문자") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: viewModel.currentTab == .text ? "eeeeee" : "777777")) .frame(width: tabWidth, height: 50) @@ -70,7 +70,7 @@ struct MessageView: View { }) { VStack(spacing: 0) { Text("음성") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: viewModel.currentTab == .voice ? "eeeeee" : "777777")) .frame(width: tabWidth, height: 50) diff --git a/SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift b/SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift index 01d49f2..94be838 100644 --- a/SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift +++ b/SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift @@ -72,13 +72,13 @@ struct TextMessageDetailView: View { from: "yyyy-MM-dd hh:mm:ss", to: "yyyy년 MM월 dd일 E요일 HH:mm" )) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .padding(.top, 16.7) ScrollView(.vertical, showsIndicators: false) { Text(messageItem.textMessage) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .multilineTextAlignment(.leading) .padding(26.7) @@ -165,7 +165,7 @@ struct TextMessageDetailView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Message/Text/SelectRecipient/SelectRecipientView.swift b/SodaLive/Sources/Message/Text/SelectRecipient/SelectRecipientView.swift index bebb01e..e2c7398 100644 --- a/SodaLive/Sources/Message/Text/SelectRecipient/SelectRecipientView.swift +++ b/SodaLive/Sources/Message/Text/SelectRecipient/SelectRecipientView.swift @@ -25,7 +25,7 @@ struct SelectRecipientView: View { TextField("닉네임을 입력해주세요", text: $viewModel.searchNickname) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .keyboardType(.default) .padding(.horizontal, 13.3) @@ -52,7 +52,7 @@ struct SelectRecipientView: View { .cornerRadius(23.3) Text(user.nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() diff --git a/SodaLive/Sources/Message/Text/TextMessageItemView.swift b/SodaLive/Sources/Message/Text/TextMessageItemView.swift index 16192c2..443cf96 100644 --- a/SodaLive/Sources/Message/Text/TextMessageItemView.swift +++ b/SodaLive/Sources/Message/Text/TextMessageItemView.swift @@ -35,7 +35,7 @@ struct TextMessageItemView: View { VStack(alignment: .leading, spacing: 4.7) { Text(nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Text(item.textMessage) diff --git a/SodaLive/Sources/Message/Text/TextMessageView.swift b/SodaLive/Sources/Message/Text/TextMessageView.swift index c14a1cd..14117a8 100644 --- a/SodaLive/Sources/Message/Text/TextMessageView.swift +++ b/SodaLive/Sources/Message/Text/TextMessageView.swift @@ -70,7 +70,7 @@ struct TextMessageView: View { Text("메시지가 없습니다.\n친구들과 소통해보세요!") .multilineTextAlignment(.center) - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) } .frame(width: screenSize().width - 26.7, height: screenSize().height / 2) diff --git a/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift b/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift index b6d8ccd..54dbe73 100644 --- a/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift +++ b/SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift @@ -22,7 +22,7 @@ struct TextMessageWriteView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("취소") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "3bb9f1").opacity(0)) Spacer() @@ -34,7 +34,7 @@ struct TextMessageWriteView: View { Spacer() Text("취소") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .onTapGesture { AppState.shared.back() @@ -52,11 +52,11 @@ struct TextMessageWriteView: View { HStack(spacing: 13.3) { Text("받는 사람") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "777777")) Text(viewModel.recipientNickname) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -124,7 +124,7 @@ struct TextMessageWriteView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Message/Voice/VoiceMessageItemView.swift b/SodaLive/Sources/Message/Voice/VoiceMessageItemView.swift index aa47739..dd71e13 100644 --- a/SodaLive/Sources/Message/Voice/VoiceMessageItemView.swift +++ b/SodaLive/Sources/Message/Voice/VoiceMessageItemView.swift @@ -47,7 +47,7 @@ struct VoiceMessageItemView: View { .cornerRadius(23.4) Text(nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .padding(.leading, 13.3) @@ -70,13 +70,13 @@ struct VoiceMessageItemView: View { HStack(spacing: 0) { Text("00:00") - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) Spacer() Text("\(secondsToMinutesSeconds(seconds: Int(soundManager.duration)))") - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) } .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/Message/Voice/VoiceMessageView.swift b/SodaLive/Sources/Message/Voice/VoiceMessageView.swift index 570577d..1431f72 100644 --- a/SodaLive/Sources/Message/Voice/VoiceMessageView.swift +++ b/SodaLive/Sources/Message/Voice/VoiceMessageView.swift @@ -78,7 +78,7 @@ struct VoiceMessageView: View { Text("메시지가 없습니다.\n친구들과 소통해보세요!") .multilineTextAlignment(.center) - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) } .frame(width: screenSize().width - 26.7, height: screenSize().height / 2) @@ -120,13 +120,13 @@ struct VoiceMessageView: View { .padding(.top, 40) Text("메시지를 보관하는데\n\(viewModel.saveMessagePrice)캔이 필요합니다.\n메시지를 보관하시겠습니까?") - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .padding(.top, 13.3) .multilineTextAlignment(.center) Text("※ 메시지 보관시, 본인이 삭제하기 전까지 영구보관됩니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .padding(.top, 13.3) .padding(.horizontal, 13.3) @@ -184,7 +184,7 @@ struct VoiceMessageView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift index 065aeab..b013e7b 100644 --- a/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift +++ b/SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift @@ -58,7 +58,7 @@ struct VoiceMessageWriteView: View { VStack(alignment: .leading, spacing: 10) { Text("TO.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Text( @@ -137,7 +137,7 @@ struct VoiceMessageWriteView: View { Spacer() Text("삭제") - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color(hex: "bbbbbb").opacity(0)) Spacer() @@ -159,7 +159,7 @@ struct VoiceMessageWriteView: View { Spacer() Text("삭제") - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .onTapGesture { soundManager.stopAudio() @@ -244,7 +244,7 @@ struct VoiceMessageWriteView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) @@ -263,7 +263,7 @@ struct VoiceMessageWriteView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Block/BlockMemberListView.swift b/SodaLive/Sources/MyPage/Block/BlockMemberListView.swift index a7b85af..922eceb 100644 --- a/SodaLive/Sources/MyPage/Block/BlockMemberListView.swift +++ b/SodaLive/Sources/MyPage/Block/BlockMemberListView.swift @@ -18,15 +18,15 @@ struct BlockMemberListView: View { HStack(spacing: 0) { Text("총") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Text(" \(viewModel.totalCount) ") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.mainRed3) Text("명") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Spacer() @@ -57,7 +57,7 @@ struct BlockMemberListView: View { } } else { Text("차단한 유저가 없습니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .frame(maxHeight: .infinity) } @@ -71,7 +71,7 @@ struct BlockMemberListView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Block/BlockedMemberListItemView.swift b/SodaLive/Sources/MyPage/Block/BlockedMemberListItemView.swift index 45399a8..5182255 100644 --- a/SodaLive/Sources/MyPage/Block/BlockedMemberListItemView.swift +++ b/SodaLive/Sources/MyPage/Block/BlockedMemberListItemView.swift @@ -32,14 +32,14 @@ struct BlockedMemberListItemView: View { .clipShape(Circle()) Text(item.nickname) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color.grayee) .padding(.leading, 13.3) Spacer() Text(isBlocked ? "차단해제" : "차단") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) .frame(minWidth: 83) .padding(.vertical, 7) diff --git a/SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift b/SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift index f5f0ad0..6b1c300 100644 --- a/SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift +++ b/SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift @@ -74,7 +74,7 @@ struct CanChargeView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) @@ -213,7 +213,7 @@ struct CanChargeTab: View { Spacer() Text(title) - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(color()) .frame(width: width) diff --git a/SodaLive/Sources/MyPage/Can/Coupon/CanCouponNoticeItemView.swift b/SodaLive/Sources/MyPage/Can/Coupon/CanCouponNoticeItemView.swift index f0b99af..2190fb1 100644 --- a/SodaLive/Sources/MyPage/Can/Coupon/CanCouponNoticeItemView.swift +++ b/SodaLive/Sources/MyPage/Can/Coupon/CanCouponNoticeItemView.swift @@ -14,12 +14,12 @@ struct CanCouponNoticeItemView: View { var body: some View { HStack(alignment: .top, spacing: 4) { Text("-") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Text(notice) .multilineTextAlignment(.leading) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .fixedSize(horizontal: false, vertical: true) } diff --git a/SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift b/SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift index bfbd5b1..6d5139d 100644 --- a/SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift +++ b/SodaLive/Sources/MyPage/Can/Coupon/CanCouponView.swift @@ -30,7 +30,7 @@ struct CanCouponView: View { .autocapitalization(.allCharacters) // Force uppercase keyboard .textContentType(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .padding(.vertical, 16.7) .padding(.horizontal, 13.3) @@ -94,7 +94,7 @@ struct CanCouponView: View { .padding(.top, 4) Text(I18n.CanCoupon.contactHelp) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) .fixedSize(horizontal: false, vertical: true) .padding(.top, 26.7) @@ -117,7 +117,7 @@ struct CanCouponView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift b/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift index 8c5b34b..631c8f1 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift @@ -64,7 +64,7 @@ struct CanPaymentView: View { .frame(width: 20, height: 20) Text("구매조건 확인 및 결제 진행 동의") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) @@ -76,11 +76,11 @@ struct CanPaymentView: View { VStack(spacing: 6.7) { HStack(alignment: .top, spacing: 0) { Text("- ") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) Text("결제 취소는 결제 후 7일 이내에만 할 수 있습니다.\n단, 캔의 일부를 사용하면 결제 취소를 할 수 없습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) .fixedSize(horizontal: false, vertical: true) } @@ -88,11 +88,11 @@ struct CanPaymentView: View { HStack(alignment: .top, spacing: 0) { Text("- ") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) Text("광고성 이벤트 등 회사가 무료로 지급한 포인트는 환불되지 않습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) .fixedSize(horizontal: false, vertical: true) } @@ -100,11 +100,11 @@ struct CanPaymentView: View { HStack(alignment: .top, spacing: 0) { Text("- ") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) Text("자세한 내용은 보이스온 이용약관에서 확인할 수 있습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) .fixedSize(horizontal: false, vertical: true) } @@ -119,7 +119,7 @@ struct CanPaymentView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 5) { Text("결제금액") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) HStack(spacing: 0) { @@ -169,7 +169,7 @@ struct CanPaymentView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) @@ -195,7 +195,7 @@ struct CanPaymentView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) @@ -214,7 +214,7 @@ struct CanPaymentView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift b/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift index eabfb91..c3be638 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift @@ -210,7 +210,7 @@ struct CanPgPaymentView: View { .frame(width: 20, height: 20) Text("구매조건 확인 및 결제 진행 동의") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) } .frame(width: screenSize().width - 53.4, alignment: .leading) @@ -222,11 +222,11 @@ struct CanPgPaymentView: View { VStack(spacing: 6.7) { HStack(alignment: .top, spacing: 0) { Text("- ") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) Text("충전된 캔의 유효기간은 충전 후 5년 입니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) .fixedSize(horizontal: false, vertical: true) } @@ -235,11 +235,11 @@ struct CanPgPaymentView: View { HStack(alignment: .top, spacing: 0) { Text("- ") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) Text("결제 취소는 결제 후 7일 이내에만 할 수 있습니다.\n단, 캔의 일부를 사용하면 결제 취소를 할 수 없습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) .fixedSize(horizontal: false, vertical: true) } @@ -247,11 +247,11 @@ struct CanPgPaymentView: View { HStack(alignment: .top, spacing: 0) { Text("- ") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) Text("광고성 이벤트 등 회사가 무료로 지급한 포인트는 환불되지 않습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) .fixedSize(horizontal: false, vertical: true) } @@ -259,11 +259,11 @@ struct CanPgPaymentView: View { HStack(alignment: .top, spacing: 0) { Text("- ") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) Text("자세한 내용은 보이스온 이용약관에서 확인할 수 있습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) .fixedSize(horizontal: false, vertical: true) } @@ -277,7 +277,7 @@ struct CanPgPaymentView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 5) { Text("결제금액") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) HStack(spacing: 0) { @@ -345,7 +345,7 @@ struct CanPgPaymentView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift b/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift index 38d249e..0ed59de 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/Temp/CanPaymentTempView.swift @@ -179,7 +179,7 @@ struct CanPaymentTempView: View { .frame(width: 20, height: 20) Text("구매조건 확인 및 결제 진행 동의") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) } .frame(width: screenSize().width - 53.4, alignment: .leading) @@ -195,7 +195,7 @@ struct CanPaymentTempView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 5) { Text("결제금액") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) HStack(spacing: 0) { @@ -252,7 +252,7 @@ struct CanPaymentTempView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Can/Status/CanChargeStatusView.swift b/SodaLive/Sources/MyPage/Can/Status/CanChargeStatusView.swift index 0b5297f..fbc3dc2 100644 --- a/SodaLive/Sources/MyPage/Can/Status/CanChargeStatusView.swift +++ b/SodaLive/Sources/MyPage/Can/Status/CanChargeStatusView.swift @@ -37,18 +37,18 @@ struct CanChargeStatusItemView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 6.7) { Text(item.canTitle) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Text(item.date) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) } Spacer() Text(item.chargeMethod) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift b/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift index 2cd3e04..b4f9613 100644 --- a/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift +++ b/SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift @@ -45,7 +45,7 @@ struct CanStatusView: View { .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) } } @@ -66,7 +66,7 @@ struct CanStatusView: View { .foregroundColor(Color(hex: "eeeeee")) Text(" 캔") - .font(.custom(Font.medium.rawValue, size: 10.7)) + .appFont(size: 10.7, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) } } @@ -83,7 +83,7 @@ struct CanStatusView: View { VStack(spacing: 0) { Spacer() Text("충전내역") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( Color(hex: viewModel.currentTab == .charge ? "eeeeee" : "777777") ) @@ -105,7 +105,7 @@ struct CanStatusView: View { VStack(spacing: 0) { Spacer() Text("사용내역") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor( Color(hex: viewModel.currentTab == .use ? "eeeeee" : "777777") ) @@ -175,7 +175,7 @@ struct CanStatusView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift b/SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift index e5077e1..dc96eeb 100644 --- a/SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift +++ b/SodaLive/Sources/MyPage/Can/Status/CanUseStatusView.swift @@ -37,11 +37,11 @@ struct CanUseStatusItemView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 6.7) { Text(item.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Text(item.date) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "777777")) } diff --git a/SodaLive/Sources/MyPage/MyPageView.swift b/SodaLive/Sources/MyPage/MyPageView.swift index 2e7f935..730330d 100644 --- a/SodaLive/Sources/MyPage/MyPageView.swift +++ b/SodaLive/Sources/MyPage/MyPageView.swift @@ -175,7 +175,7 @@ struct MyPageView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListAllInnerView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListAllInnerView.swift index 750899d..223a4c7 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListAllInnerView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListAllInnerView.swift @@ -15,15 +15,15 @@ struct OrderListAllInnerView: View { VStack(spacing: 0) { HStack(spacing: 0) { Text("총") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Text(" \(viewModel.totalCount) ") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "dd4500")) Text("개") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Spacer() @@ -66,7 +66,7 @@ struct OrderListAllInnerView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListItemView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListItemView.swift index be8d63a..d1c4bcf 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListItemView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListItemView.swift @@ -31,14 +31,14 @@ struct OrderListItemView: View { VStack(alignment: .leading, spacing: 0) { HStack(spacing: 8) { Text(item.themeStr) - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(Color(hex: "3bac6a")) .padding(2.6) .background(Color(hex: "28312b")) .cornerRadius(2.6) Text(item.duration!) - .font(.custom(Font.medium.rawValue, size: 8)) + .appFont(size: 8, weight: .medium) .foregroundColor(Color(hex: "777777")) .padding(2.6) .background(Color(hex: "222222")) @@ -46,12 +46,12 @@ struct OrderListItemView: View { } Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 9)) + .appFont(size: 9, weight: .medium) .foregroundColor(Color(hex: "777777")) .padding(.top, 2.6) Text(item.title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "d2d2d2")) .fixedSize(horizontal: false, vertical: true) .padding(.top, 2.6) @@ -64,7 +64,7 @@ struct OrderListItemView: View { .frame(width: 13.3, height: 13.3) Text("\(item.likeCount)") - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color(hex: "777777")) } @@ -74,7 +74,7 @@ struct OrderListItemView: View { .frame(width: 13.3, height: 13.3) Text("\(item.commentCount)") - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color(hex: "777777")) } } @@ -83,7 +83,7 @@ struct OrderListItemView: View { Spacer() Text(item.orderType == .RENTAL ? "대여중" : "소장중") - .font(.custom(Font.medium.rawValue, size: 10.3)) + .appFont(size: 10.3, weight: .medium) .foregroundColor(item.orderType == .RENTAL ? .white : .black) .padding(.horizontal, 5.3) .padding(.vertical, 2.7) diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListView.swift index 3373820..4a09dd7 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListView.swift @@ -20,7 +20,7 @@ struct OrderListView: View { Spacer() Text("전체보기") - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.graybb) .onTapGesture { AppState.shared.setAppStep(step: .orderListAll) diff --git a/SodaLive/Sources/MyPage/Point/PointStatusView.swift b/SodaLive/Sources/MyPage/Point/PointStatusView.swift index 8b76018..3bdfc82 100644 --- a/SodaLive/Sources/MyPage/Point/PointStatusView.swift +++ b/SodaLive/Sources/MyPage/Point/PointStatusView.swift @@ -41,7 +41,7 @@ struct PointStatusView: View { .padding(.top, 13.3) Text("※ 획득한 포인트는 72시간이 지나면 자동소멸 됩니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) .padding(.top, 13.3) @@ -49,7 +49,7 @@ struct PointStatusView: View { VStack(spacing: 0) { Spacer() Text("받은내역") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(viewModel.currentTab == .reward ? .grayee : .gray77) Spacer() Rectangle() @@ -70,7 +70,7 @@ struct PointStatusView: View { VStack(spacing: 0) { Spacer() Text("사용내역") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(viewModel.currentTab == .use ? .grayee : .gray77) Spacer() Rectangle() @@ -118,7 +118,7 @@ struct PointStatusView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Point/Reward/PointRewardStatusView.swift b/SodaLive/Sources/MyPage/Point/Reward/PointRewardStatusView.swift index a0be4ae..a32b1cb 100644 --- a/SodaLive/Sources/MyPage/Point/Reward/PointRewardStatusView.swift +++ b/SodaLive/Sources/MyPage/Point/Reward/PointRewardStatusView.swift @@ -38,18 +38,18 @@ struct PointRewardStatusItemView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 6.7) { Text(item.rewardPoint) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) Text(item.date) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.gray77) } Spacer() Text(item.method) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) } .padding(.horizontal, 13.3) diff --git a/SodaLive/Sources/MyPage/Point/Use/PointUseStatusView.swift b/SodaLive/Sources/MyPage/Point/Use/PointUseStatusView.swift index 016f357..f63afb8 100644 --- a/SodaLive/Sources/MyPage/Point/Use/PointUseStatusView.swift +++ b/SodaLive/Sources/MyPage/Point/Use/PointUseStatusView.swift @@ -38,18 +38,18 @@ struct PointUseStatusItemView: View { HStack(spacing: 0) { VStack(alignment: .leading, spacing: 6.7) { Text(item.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) Text(item.date) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.gray77) } Spacer() Text("\(item.point)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) Image("ic_point") diff --git a/SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift b/SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift index a623e2c..9d8060a 100644 --- a/SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift +++ b/SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift @@ -20,14 +20,14 @@ struct NicknameUpdateView: View { Text("닉네임 변경으로 인해 피해를 입는 사용자가 지속적으로 발생하여 닉네임 변경을 부득이하게 유료로 전환합니다.") .fixedSize(horizontal: false, vertical: true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .frame(width: screenSize().width - 40, alignment: .leading) .padding(.top, 40) Text("최초 1회에 한해서 무료로 변경이 가능하고, 그 이후부터는 유료로 전환됩니다.") .fixedSize(horizontal: false, vertical: true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "dd4500")) .frame(width: screenSize().width - 40, alignment: .leading) @@ -94,7 +94,7 @@ struct NicknameUpdateView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift b/SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift index b8d6ceb..dd065d7 100644 --- a/SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift +++ b/SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift @@ -20,7 +20,7 @@ struct ModifyPasswordView: View { ScrollView(.vertical, showsIndicators: false) { Text("안전한 비밀번호로 내 내 정보를 보호하세요") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .padding(.top, 40) @@ -50,7 +50,7 @@ struct ModifyPasswordView: View { .frame(width: screenSize().width - 53.4) Text("* 영문, 숫자 포함 8자 이상") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.mainRed3) .frame(width: screenSize().width - 53.4, alignment: .leading) .padding(.top, 13.7) @@ -94,7 +94,7 @@ struct ModifyPasswordView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift b/SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift index 4d93673..d56f0c7 100644 --- a/SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift +++ b/SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift @@ -22,12 +22,12 @@ struct ProfileUpdateView: View { VStack(spacing: 26.7) { VStack(alignment: .leading, spacing: 0) { Text("이메일") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayee) .padding(.leading, 6.7) Text(viewModel.email) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) .padding(.top, 12) .padding(.leading, 6.7) @@ -41,12 +41,12 @@ struct ProfileUpdateView: View { HStack(alignment: .bottom, spacing: 13.3) { VStack(alignment: .leading, spacing: 0) { Text("비밀번호") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayee) .padding(.leading, 6.7) Text("********") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.gray77) .padding(.top, 12) .padding(.leading, 6.7) @@ -81,12 +81,12 @@ struct ProfileUpdateView: View { HStack(alignment: .bottom, spacing: 13.3) { VStack(alignment: .leading, spacing: 0) { Text("닉네임") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayee) .padding(.leading, 6.7) Text(viewModel.nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .padding(.top, 12) .padding(.leading, 6.7) @@ -122,7 +122,7 @@ struct ProfileUpdateView: View { .frame(width: 20, height: 20) Text("여자") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } } @@ -136,7 +136,7 @@ struct ProfileUpdateView: View { .frame(width: 20, height: 20) Text("남자") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } } @@ -150,7 +150,7 @@ struct ProfileUpdateView: View { .frame(width: 20, height: 20) Text("공개 안 함") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } } @@ -235,7 +235,7 @@ struct ProfileUpdateView: View { ForEach(viewModel.tags, id: \.self) { tag in HStack(spacing: 6.7) { Text(tag) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(.white) Image("ic_circle_x") @@ -449,7 +449,7 @@ struct ProfileUpdateView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift b/SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift index dd47f91..d0264fb 100644 --- a/SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift +++ b/SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift @@ -71,7 +71,7 @@ struct MemberTagView: View { } Text(tag.tag) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor( selectedTags.contains(tag.tag) ? Color.button : diff --git a/SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift b/SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift index 1a83a7d..290a620 100644 --- a/SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift @@ -31,7 +31,7 @@ struct LiveReservationCancelView: View { if item.price > 0 { Text("결제한 \(item.price)캔이\n환불처리 되었습니다.") - .font(.custom(Font.medium.rawValue, size: 20)) + .appFont(size: 20, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .frame(width: screenSize().width - 26.7, alignment: .leading) .padding(.top, 20) @@ -39,7 +39,7 @@ struct LiveReservationCancelView: View { HStack(spacing: 13.3) { Text("다른 라이브 예약하기") - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color.button) .padding(.vertical, 16) .frame(width: (screenSize().width - 40) / 2) @@ -57,7 +57,7 @@ struct LiveReservationCancelView: View { } Text("캔내역 확인하기") - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(.white) .padding(.vertical, 16) .frame(width: (screenSize().width - 40) / 2) @@ -89,16 +89,16 @@ struct LiveReservationCancelView: View { .parseUtcIsoDate()? .convertDateFormat(dateFormat: "yyyy.MM.dd EEE hh:mm a") ?? item.beginDateTimeUtc Text(beginDateText) - .font(.custom(Font.medium.rawValue, size: 9.3)) + .appFont(size: 9.3, weight: .medium) .foregroundColor(Color(hex: "ffd300")) Text(item.masterNickname) - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(Color.graybb) .padding(.top, 10) Text(item.title) - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) .lineLimit(2) .padding(.top, 4.3) @@ -108,7 +108,7 @@ struct LiveReservationCancelView: View { "\(item.price)캔" : "무료" ) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "e2e2e2").opacity(0.4)) .padding(.top, 15.3) } @@ -130,7 +130,7 @@ struct LiveReservationCancelView: View { .frame(width: screenSize().width - 26.7, alignment: .leading) Text("예약취소 이유를 선택해주세요. 서비스 개선에 중요한 자료로 활용하겠습니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .frame(width: screenSize().width - 26.7, alignment: .leading) } @@ -149,7 +149,7 @@ struct LiveReservationCancelView: View { .frame(width: 20, height: 20) Text(reason) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) if index == viewModel.cancelReasons.count - 1 { @@ -157,7 +157,7 @@ struct LiveReservationCancelView: View { TextField("입력해주세요", text: $viewModel.reason) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .keyboardType(.webSearch) @@ -181,7 +181,7 @@ struct LiveReservationCancelView: View { .padding(.vertical, 20) Text("취소요청시, 차감했던 캔은 환불처리 됩니다. 수다방 참여인원 제한에 따라 재예약이 불가할 수 있습니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "ff5c49")) .frame(width: screenSize().width - 53.4, alignment: .leading) @@ -211,7 +211,7 @@ struct LiveReservationCancelView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift b/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift index 97376c9..a020036 100644 --- a/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusItemView.swift @@ -33,16 +33,16 @@ struct LiveReservationStatusItemView: View { .parseUtcIsoDate()? .convertDateFormat(dateFormat: "yyyy.MM.dd EEE hh:mm a") ?? item.beginDateTimeUtc Text(beginDateText) - .font(.custom(Font.medium.rawValue, size: 9.3)) + .appFont(size: 9.3, weight: .medium) .foregroundColor(Color(hex: "ffd300")) Text(item.masterNickname) - .font(.custom(Font.medium.rawValue, size: 11.3)) + .appFont(size: 11.3, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .padding(.top, 10) Text(item.title) - .font(.custom(Font.medium.rawValue, size: 15.3)) + .appFont(size: 15.3, weight: .medium) .foregroundColor(Color(hex: "e2e2e2")) .lineLimit(2) .padding(.top, 4.3) @@ -53,7 +53,7 @@ struct LiveReservationStatusItemView: View { "\(item.price)캔" : "무료" ) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "e2e2e2").opacity(0.4)) Spacer() diff --git a/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusView.swift b/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusView.swift index 254464b..ba01bbf 100644 --- a/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusView.swift @@ -27,7 +27,7 @@ struct LiveReservationStatusView: View { } } else { Text("예약한 라이브가 없습니다.") - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(Color(hex: "bbbbbb")) .frame(maxHeight: .infinity) } @@ -40,7 +40,7 @@ struct LiveReservationStatusView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/MyPage/ReservationStatusView.swift b/SodaLive/Sources/MyPage/ReservationStatusView.swift index 229ebe8..2dc0e5a 100644 --- a/SodaLive/Sources/MyPage/ReservationStatusView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatusView.swift @@ -29,7 +29,7 @@ struct ReservationStatusView: View { .foregroundColor(Color(hex: "3bb9f1")) Text("\(data.liveReservationCount)") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) } .frame(width: width, height: 46.7) diff --git a/SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift b/SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift index 9eee845..6607ff4 100644 --- a/SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift +++ b/SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift @@ -26,7 +26,7 @@ struct FaqView: View { .foregroundColor(Color.button) Text(faq.question) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.grayee) .fixedSize(horizontal: false, vertical: true) @@ -47,7 +47,7 @@ struct FaqView: View { .padding(.top, 13.3) RichText(html: faq.answer) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) } .padding(.vertical, 20) diff --git a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterCategoryItemView.swift b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterCategoryItemView.swift index 3a90bd3..ca0b417 100644 --- a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterCategoryItemView.swift +++ b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterCategoryItemView.swift @@ -15,7 +15,7 @@ struct ServiceCenterCategoryItemView: View { var body: some View { GeometryReader { proxy in Text(category) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) .frame(width: proxy.size.width, height: 46.7) .background(isSelected ? Color.button : Color.gray22) diff --git a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift index 587c522..34ecc19 100644 --- a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift +++ b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift @@ -78,7 +78,7 @@ struct ServiceCenterView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Report/CheersReportDialogView.swift b/SodaLive/Sources/Report/CheersReportDialogView.swift index 58e1e1f..dff6591 100644 --- a/SodaLive/Sources/Report/CheersReportDialogView.swift +++ b/SodaLive/Sources/Report/CheersReportDialogView.swift @@ -32,7 +32,7 @@ struct CheersReportDialogView: View { VStack(spacing: 13.3) { Text("응원글 신고") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) VStack(spacing: 13.3) { @@ -44,7 +44,7 @@ struct CheersReportDialogView: View { .frame(width: 20, height: 20) Text(reason) - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color(hex: "909090")) Spacer() @@ -60,14 +60,14 @@ struct CheersReportDialogView: View { Spacer() Text("취소") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .onTapGesture { isShowing = false } Text("신고") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .onTapGesture { if let selectedIndex = selectedIndex { diff --git a/SodaLive/Sources/Report/ProfileReportDialogView.swift b/SodaLive/Sources/Report/ProfileReportDialogView.swift index ba72e5c..f737aca 100644 --- a/SodaLive/Sources/Report/ProfileReportDialogView.swift +++ b/SodaLive/Sources/Report/ProfileReportDialogView.swift @@ -21,25 +21,25 @@ struct ProfileReportDialogView: View { VStack(spacing: 13.3) { Text("프로필 사진 신고") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) Text("신고제도를 남용할 경우, 계정에 제약이 있을 수 있습니다.\n프로필 사진을 신고하시겠습니까?") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "909090")) HStack(spacing: 26.7) { Spacer() Text("취소") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .onTapGesture { isShowing = false } Text("신고") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .onTapGesture { isShowing = false diff --git a/SodaLive/Sources/Report/ProfileReportMenuView.swift b/SodaLive/Sources/Report/ProfileReportMenuView.swift index 8a5aa99..4f290c8 100644 --- a/SodaLive/Sources/Report/ProfileReportMenuView.swift +++ b/SodaLive/Sources/Report/ProfileReportMenuView.swift @@ -30,7 +30,7 @@ struct ProfileReportMenuView: View { VStack(spacing: 13.3) { HStack(spacing: 0) { Text(isBlockedUser ? "사용자 차단해제" : "사용자 차단하기") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) Spacer() @@ -49,7 +49,7 @@ struct ProfileReportMenuView: View { HStack(spacing: 0) { Text("사용자 신고하기") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) Spacer() @@ -64,7 +64,7 @@ struct ProfileReportMenuView: View { HStack(spacing: 0) { Text("프로필 신고하기") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) Spacer() diff --git a/SodaLive/Sources/Report/UserBlockConfirmDialogView.swift b/SodaLive/Sources/Report/UserBlockConfirmDialogView.swift index fd43ba0..bfa035f 100644 --- a/SodaLive/Sources/Report/UserBlockConfirmDialogView.swift +++ b/SodaLive/Sources/Report/UserBlockConfirmDialogView.swift @@ -33,16 +33,16 @@ struct UserBlockConfirmDialogView: View { VStack(spacing: 13.3) { Text("사용자 차단") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(.white) Text("\(nickname)님을 차단하시겠습니까?") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) HStack(spacing: 0) { Text(UserDefaults.string(forKey: .role) == MemberRole.CREATOR.rawValue ? notice : notice2) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.white) Spacer() @@ -52,14 +52,14 @@ struct UserBlockConfirmDialogView: View { Spacer() Text("취소") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) .onTapGesture { isShowing = false } Text("차단") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.button) .onTapGesture { isShowing = false diff --git a/SodaLive/Sources/Report/UserReportDialogView.swift b/SodaLive/Sources/Report/UserReportDialogView.swift index 55398cf..4252a2a 100644 --- a/SodaLive/Sources/Report/UserReportDialogView.swift +++ b/SodaLive/Sources/Report/UserReportDialogView.swift @@ -33,7 +33,7 @@ struct UserReportDialogView: View { VStack(spacing: 13.3) { Text("사용자 신고") - .font(.custom(Font.medium.rawValue, size: 16.7)) + .appFont(size: 16.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) VStack(spacing: 13.3) { @@ -45,7 +45,7 @@ struct UserReportDialogView: View { .frame(width: 20, height: 20) Text(reason) - .font(.custom(Font.medium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color(hex: "909090")) Spacer() @@ -61,14 +61,14 @@ struct UserReportDialogView: View { Spacer() Text("취소") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .onTapGesture { isShowing = false } Text("신고") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "3bb9f1")) .onTapGesture { if let selectedIndex = selectedIndex { diff --git a/SodaLive/Sources/Search/SearchUnifiedView.swift b/SodaLive/Sources/Search/SearchUnifiedView.swift index d6e5a3f..38ef86d 100644 --- a/SodaLive/Sources/Search/SearchUnifiedView.swift +++ b/SodaLive/Sources/Search/SearchUnifiedView.swift @@ -82,7 +82,7 @@ struct SearchUnifiedItemView: View { } Text("더보기 >") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.grayee) .padding(.vertical, 10) .frame(maxWidth: .infinity) @@ -108,7 +108,7 @@ struct SearchCreatorItemView: View { .clipShape(Circle()) Text(item.nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Spacer() @@ -136,13 +136,13 @@ struct SearchContentItemView: View { VStack(alignment: .leading, spacing: 6.7) { Text(item.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .multilineTextAlignment(.leading) .lineLimit(2) Text(item.nickname) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color.gray77) } @@ -173,13 +173,13 @@ struct SearchSeriesItemView: View { VStack(alignment: .leading, spacing: 6.7) { Text(item.title) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) .multilineTextAlignment(.leading) .lineLimit(2) Text(item.nickname) - .font(.custom(Font.medium.rawValue, size: 10)) + .appFont(size: 10, weight: .medium) .foregroundColor(Color.gray77) } diff --git a/SodaLive/Sources/Search/SearchView.swift b/SodaLive/Sources/Search/SearchView.swift index 93e96aa..7d9b3d6 100644 --- a/SodaLive/Sources/Search/SearchView.swift +++ b/SodaLive/Sources/Search/SearchView.swift @@ -75,7 +75,7 @@ struct SearchView: View { let tabItem = tabItemList[index] Text(tabItem.title) - .font(.custom(Font.medium.rawValue,size: 16)) + .appFont(size: 16, weight: .medium) .foregroundColor( viewModel.currentTab == tabItem.tab ? .button : @@ -127,7 +127,7 @@ struct SearchView: View { viewModel.searchUnifiedSeriesList.isEmpty && viewModel.keyword.count > 2 { Text("검색 결과가 없습니다.") - .font(.custom(Font.medium.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .medium) .foregroundColor(.white) .padding(.top, 20) } @@ -141,7 +141,7 @@ struct SearchView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/SearchChannel/SearchChannelView.swift b/SodaLive/Sources/SearchChannel/SearchChannelView.swift index 5c35f49..87839c1 100644 --- a/SodaLive/Sources/SearchChannel/SearchChannelView.swift +++ b/SodaLive/Sources/SearchChannel/SearchChannelView.swift @@ -65,7 +65,7 @@ struct SearchChannelView: View { .clipShape(Circle()) Text(channel.nickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) Spacer() } @@ -78,7 +78,7 @@ struct SearchChannelView: View { } } else { Text("검색 결과가 없습니다.") - .font(.custom(Font.medium.rawValue, size: 18.3)) + .appFont(size: 18.3, weight: .medium) .foregroundColor(.white) .padding(.top, 20) } @@ -93,7 +93,7 @@ struct SearchChannelView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/Settings/Content/ContentSettingsView.swift b/SodaLive/Sources/Settings/Content/ContentSettingsView.swift index b44c41e..5abcefe 100644 --- a/SodaLive/Sources/Settings/Content/ContentSettingsView.swift +++ b/SodaLive/Sources/Settings/Content/ContentSettingsView.swift @@ -58,7 +58,7 @@ struct ContentSettingsView: View { .frame(width: 20, height: 20) Text("전체") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } .contentShape(Rectangle()) @@ -78,7 +78,7 @@ struct ContentSettingsView: View { .frame(width: 20, height: 20) Text("남성향") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } .contentShape(Rectangle()) @@ -98,7 +98,7 @@ struct ContentSettingsView: View { .frame(width: 20, height: 20) Text("여성향") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } .contentShape(Rectangle()) diff --git a/SodaLive/Sources/Settings/Event/EventListView.swift b/SodaLive/Sources/Settings/Event/EventListView.swift index 31a4d55..eac2780 100644 --- a/SodaLive/Sources/Settings/Event/EventListView.swift +++ b/SodaLive/Sources/Settings/Event/EventListView.swift @@ -56,7 +56,7 @@ struct EventListView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Settings/Notice/NoticeDetailView.swift b/SodaLive/Sources/Settings/Notice/NoticeDetailView.swift index 82f8cb8..665c948 100644 --- a/SodaLive/Sources/Settings/Notice/NoticeDetailView.swift +++ b/SodaLive/Sources/Settings/Notice/NoticeDetailView.swift @@ -19,12 +19,12 @@ struct NoticeDetailView: View { VStack(alignment: .leading, spacing: 6.7) { Text(notice.title) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .padding(.horizontal, 13.3) Text(notice.date) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "525252")) .padding(.horizontal, 13.3) } diff --git a/SodaLive/Sources/Settings/Notice/NoticeListView.swift b/SodaLive/Sources/Settings/Notice/NoticeListView.swift index 4c11d4b..b4666da 100644 --- a/SodaLive/Sources/Settings/Notice/NoticeListView.swift +++ b/SodaLive/Sources/Settings/Notice/NoticeListView.swift @@ -23,12 +23,12 @@ struct NoticeListView: View { Spacer() Text(notice.title) - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .padding(.horizontal, 13.3) Text(notice.date) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "525252")) .padding(.horizontal, 13.3) @@ -58,7 +58,7 @@ struct NoticeListView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift b/SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift index abfdf6e..d6ea5ba 100644 --- a/SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift +++ b/SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift @@ -94,7 +94,7 @@ struct NotificationSettingsView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Settings/SettingsView.swift b/SodaLive/Sources/Settings/SettingsView.swift index c3bbab8..6e672c9 100644 --- a/SodaLive/Sources/Settings/SettingsView.swift +++ b/SodaLive/Sources/Settings/SettingsView.swift @@ -152,7 +152,7 @@ struct SettingsView: View { let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String Text("Ver \(version!)") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.grayee) } .padding(.horizontal, 16.7) @@ -176,7 +176,7 @@ struct SettingsView: View { - 대표 이메일 : sodalive.official@gmail.com """) - .font(.custom(Font.medium.rawValue, size: 11)) + .appFont(size: 11, weight: .medium) .foregroundColor(Color.gray77) .frame(width: cardWidth, alignment: .leading) .padding(.top, 13.3) @@ -193,7 +193,7 @@ struct SettingsView: View { .padding(.top, 46.7) Text("모든 기기에서 로그아웃") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) .padding(.top, 13.3) .onTapGesture { @@ -201,7 +201,7 @@ struct SettingsView: View { } Text("회원탈퇴") - .font(.custom(Font.medium.rawValue, size: 14.7)) + .appFont(size: 14.7, weight: .medium) .foregroundColor(Color.gray77) .underline() .padding(.vertical, 26.7) @@ -268,7 +268,7 @@ struct SettingsView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/Settings/SignOut/SignOutView.swift b/SodaLive/Sources/Settings/SignOut/SignOutView.swift index 17461dc..b94e5c8 100644 --- a/SodaLive/Sources/Settings/SignOut/SignOutView.swift +++ b/SodaLive/Sources/Settings/SignOut/SignOutView.swift @@ -25,7 +25,7 @@ struct SignOutView: View { .frame(width: screenSize().width - 26.7, alignment: .leading) Text("계정을 삭제하려는 이유를 선택해주세요.\n서비스 개선에 중요한 자료로 활용하겠습니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .frame(width: screenSize().width - 26.7, alignment: .leading) @@ -43,7 +43,7 @@ struct SignOutView: View { .frame(width: 20, height: 20) Text(reason) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) if index == viewModel.reasons.count - 1 { @@ -51,7 +51,7 @@ struct SignOutView: View { TextField("입력해주세요", text: $viewModel.reason) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .keyboardType(.webSearch) @@ -75,7 +75,7 @@ struct SignOutView: View { .padding(.top, 20) Text("계정을 삭제하면 회원님의 모든 콘텐츠와 활동 길고, 캔충전 및 적립, 사용내역 등의 기록이 삭제됩니다. 삭제된 정보는 복구할 수 없으니 신중히 결정해주세요.\n캔 충전하기를 통해 적립한 캔은 계정 삭제시 환불이 불가합니다. 또한 환불 신청 후 환불처리가 되기 전에 계정을 삭제하는 경우 포인트 사용내역을 확인할 수 없어 환불이 불가합니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "ff5c49")) .fixedSize(horizontal: false, vertical: true) .padding(.horizontal, 26.7) @@ -92,7 +92,7 @@ struct SignOutView: View { .padding(.horizontal, 26.7) Text("※ 소셜 로그인 이용자는 비밀번호를 입력하지 말고 '탈퇴하기'를 클릭하면 자동 탈퇴됩니다.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(.grayee) .fixedSize(horizontal: false, vertical: true) .padding(.horizontal, 26.7) @@ -123,7 +123,7 @@ struct SignOutView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "3bb9f1")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/UI/Component/SeriesItemBadgeView.swift b/SodaLive/Sources/UI/Component/SeriesItemBadgeView.swift index 99b6fdd..ce53f9b 100644 --- a/SodaLive/Sources/UI/Component/SeriesItemBadgeView.swift +++ b/SodaLive/Sources/UI/Component/SeriesItemBadgeView.swift @@ -14,7 +14,7 @@ struct SeriesItemBadgeView: View { var body: some View { Text(title) - .font(.custom(Font.medium.rawValue, size: 10.3)) + .appFont(size: 10.3, weight: .medium) .foregroundColor(.white) .padding(.vertical, 3.7) .padding(.horizontal, 5.3) diff --git a/SodaLive/Sources/UI/Component/SeriesKeywordChipView.swift b/SodaLive/Sources/UI/Component/SeriesKeywordChipView.swift index d817d6d..e5b4927 100644 --- a/SodaLive/Sources/UI/Component/SeriesKeywordChipView.swift +++ b/SodaLive/Sources/UI/Component/SeriesKeywordChipView.swift @@ -13,7 +13,7 @@ struct SeriesKeywordChipView: View { var body: some View { Text(keyword) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayd2) .padding(.horizontal, 8) .padding(.vertical, 5.3) diff --git a/SodaLive/Sources/UI/Component/SeriesListBigItemView.swift b/SodaLive/Sources/UI/Component/SeriesListBigItemView.swift index 0e8e334..625612e 100644 --- a/SodaLive/Sources/UI/Component/SeriesListBigItemView.swift +++ b/SodaLive/Sources/UI/Component/SeriesListBigItemView.swift @@ -67,7 +67,7 @@ struct SeriesListBigItemView: View { .frame(width: 116.7, height: 165, alignment: .center) Text(item.title) - .font(.custom(Font.preMedium.rawValue, size: 18)) + .appFont(size: 18, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(1) @@ -82,7 +82,7 @@ struct SeriesListBigItemView: View { .clipShape(Circle()) Text(item.creator.nickname) - .font(.custom(Font.preMedium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.gray77) .lineLimit(1) } @@ -98,7 +98,7 @@ struct SeriesListBigItemView: View { } Text(item.publishedDaysOfWeek) - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray77) } .frame(width: 116.7) diff --git a/SodaLive/Sources/UI/Component/SeriesListItemView.swift b/SodaLive/Sources/UI/Component/SeriesListItemView.swift index d920f64..68e8b2c 100644 --- a/SodaLive/Sources/UI/Component/SeriesListItemView.swift +++ b/SodaLive/Sources/UI/Component/SeriesListItemView.swift @@ -56,14 +56,14 @@ struct SeriesListItemView: View { .frame(width: itemWidth, height: itemWidth * 432 / 306) Text(item.title) - .font(.custom(Font.preMedium.rawValue, size: 18)) + .appFont(size: 18, weight: .medium) .foregroundColor(Color.grayee) .lineLimit(2) .multilineTextAlignment(.leading) .frame(width: itemWidth, alignment: .leading) Text(item.publishedDaysOfWeek) - .font(.custom(Font.preMedium.rawValue, size: 14)) + .appFont(size: 14, weight: .medium) .foregroundColor(Color.gray77) .frame(width: itemWidth, alignment: .leading) } diff --git a/SodaLive/Sources/User/FindPassword/FindPasswordView.swift b/SodaLive/Sources/User/FindPassword/FindPasswordView.swift index d323b53..52b8f9c 100644 --- a/SodaLive/Sources/User/FindPassword/FindPasswordView.swift +++ b/SodaLive/Sources/User/FindPassword/FindPasswordView.swift @@ -30,7 +30,7 @@ struct FindPasswordView: View { .padding(.horizontal, 26.7) Text("임시 비밀번호로 로그인 후\n마이페이지 > 프로필 설정에서\n비밀번호를 변경하고 이용하세요.") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "909090")) .multilineTextAlignment(.center) .lineSpacing(6) @@ -41,7 +41,7 @@ struct FindPasswordView: View { .focused($isFocused) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(.grayee) .keyboardType(.emailAddress) .padding(.vertical, 18) @@ -68,7 +68,7 @@ struct FindPasswordView: View { Image("ic_headphones_blue") Text("고객센터로 문의하기") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(.button) } .padding(.vertical, 10.7) @@ -96,7 +96,7 @@ struct FindPasswordView: View { .padding(.vertical, 13.3) .padding(.horizontal, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color(hex: "9970ff")) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/User/Login/LoginView.swift b/SodaLive/Sources/User/Login/LoginView.swift index dff73d6..2d405aa 100644 --- a/SodaLive/Sources/User/Login/LoginView.swift +++ b/SodaLive/Sources/User/Login/LoginView.swift @@ -31,7 +31,7 @@ struct LoginView: View { .focused($focusedField, equals: .email) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(.grayee) .keyboardType(.emailAddress) .padding(.vertical, 18) @@ -58,7 +58,7 @@ struct LoginView: View { .focused($focusedField, equals: .password) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(.grayee) Spacer() @@ -95,7 +95,7 @@ struct LoginView: View { .padding(.top, 40) Text("비밀번호를 잊으셨나요?") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) .padding(.vertical, 10) .onTapGesture { @@ -105,7 +105,7 @@ struct LoginView: View { .padding(.top, 30) Text("보이스온 회원이 아닌가요? 지금 가입하세요.") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color.graybb) .padding(.vertical, 10) .onTapGesture { @@ -127,7 +127,7 @@ struct LoginView: View { Text(viewModel.errorMessage) .padding(.vertical, 13.3) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) diff --git a/SodaLive/Sources/User/SignUp/SignUpView.swift b/SodaLive/Sources/User/SignUp/SignUpView.swift index 10cf19d..cc4d7fd 100644 --- a/SodaLive/Sources/User/SignUp/SignUpView.swift +++ b/SodaLive/Sources/User/SignUp/SignUpView.swift @@ -32,7 +32,7 @@ struct SignUpView: View { .focused($focusedField, equals: .email) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(.grayee) .keyboardType(.emailAddress) .padding(.vertical, 18) @@ -60,7 +60,7 @@ struct SignUpView: View { .focused($focusedField, equals: .password) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 15)) + .appFont(size: 15, weight: .medium) .foregroundColor(.grayee) Spacer() @@ -97,11 +97,11 @@ struct SignUpView: View { HStack(spacing: 5) { Text("이용약관") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayee) Text("(필수)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) } .onTapGesture { @@ -130,11 +130,11 @@ struct SignUpView: View { HStack(spacing: 5) { Text("개인정보수집 및 이용동의") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.grayee) Text("(필수)") - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color.button) } .onTapGesture { @@ -196,7 +196,7 @@ struct SignUpView: View { .padding(.vertical, 13.3) .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) diff --git a/SodaLive/Sources/User/UserTextField.swift b/SodaLive/Sources/User/UserTextField.swift index 3659d34..40ec763 100644 --- a/SodaLive/Sources/User/UserTextField.swift +++ b/SodaLive/Sources/User/UserTextField.swift @@ -22,7 +22,7 @@ struct UserTextField: View { var body: some View { VStack(alignment: .leading, spacing: 0) { Text(title) - .font(.custom(Font.medium.rawValue, size: 12)) + .appFont(size: 12, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .padding(.leading, 6.7) @@ -30,7 +30,7 @@ struct UserTextField: View { SecureField(hint, text: $variable) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .padding(.top, 12) .padding(.leading, 6.7) @@ -38,7 +38,7 @@ struct UserTextField: View { TextField(hint, text: $variable) .autocapitalization(.none) .disableAutocorrection(true) - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) .keyboardType(keyboardType) .padding(.top, 12) @@ -60,7 +60,7 @@ struct UserTextField: View { } Text("비밀번호 표시") - .font(.custom(Font.medium.rawValue, size: 13.3)) + .appFont(size: 13.3, weight: .medium) .foregroundColor(Color(hex: "eeeeee")) } }