커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -18,7 +18,7 @@ struct ContentMainAlarmAllView: 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)
|
||||
@@ -36,16 +36,16 @@ struct ContentMainAlarmAllView: 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)
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ struct ContentMainTabAlarmView: 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)
|
||||
|
||||
@@ -18,7 +18,7 @@ struct ContentMainAsmrAllView: View {
|
||||
DetailNavigationBar(title: "새로운 ASMR")
|
||||
|
||||
Text("※ 최근 2주간 등록된 새로운 ASMR 입니다.")
|
||||
.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 ContentMainAsmrAllView: 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)
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ struct ContentMainTabAsmrView: 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)
|
||||
|
||||
@@ -90,7 +90,7 @@ struct ContentMainTabContentView: 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)
|
||||
|
||||
@@ -83,11 +83,11 @@ struct ContentMainTabRankContentView: View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text(content.title)
|
||||
.lineLimit(2)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(.grayd2)
|
||||
|
||||
Text(content.creatorNickname)
|
||||
.font(.custom(Font.medium.rawValue, size: 11))
|
||||
.appFont(size: 11, weight: .medium)
|
||||
.foregroundColor(.gray77)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ struct ContentMainTagCurationView: View {
|
||||
ForEach(0..<tagList.count, id: \.self) { index in
|
||||
let tag = tagList[index]
|
||||
Text(tagList[index])
|
||||
.font(.custom(Font.medium.rawValue, size: 10))
|
||||
.appFont(size: 10, weight: .medium)
|
||||
.foregroundColor(
|
||||
selectedTag == tag ?
|
||||
.button:
|
||||
@@ -123,11 +123,11 @@ struct ContentMainTagCurationContentView: 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)
|
||||
}
|
||||
}
|
||||
@@ -141,7 +141,7 @@ struct ContentMainTagCurationContentView: 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)
|
||||
@@ -155,7 +155,7 @@ struct ContentMainTagCurationContentView: View {
|
||||
.frame(width: itemWidth, height: itemWidth)
|
||||
|
||||
Text(item.title)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(Color.grayd2)
|
||||
.frame(width: itemWidth, alignment: .leading)
|
||||
.multilineTextAlignment(.leading)
|
||||
@@ -178,7 +178,7 @@ struct ContentMainTagCurationContentView: 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)
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ struct ContentByChannelView: View {
|
||||
}
|
||||
|
||||
Text(content.price > 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 {
|
||||
|
||||
@@ -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 :
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -19,7 +19,7 @@ struct ContentMainSeriesGenreView: View {
|
||||
ForEach(0..<genreList.count, id: \.self) { index in
|
||||
let genre = genreList[index]
|
||||
Text(genre.genre)
|
||||
.font(.custom(Font.medium.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .medium)
|
||||
.foregroundColor(selectedGenreId == genre.id ? Color.button : Color.gray77)
|
||||
.padding(.horizontal, 13.3)
|
||||
.padding(.vertical, 9.3)
|
||||
|
||||
@@ -50,11 +50,11 @@ struct ContentMainSeriesRankingView: View {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text(series.title)
|
||||
.lineLimit(2)
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.appFont(size: 13.3, weight: .medium)
|
||||
.foregroundColor(.grayd2)
|
||||
|
||||
Text(series.creator.nickname)
|
||||
.font(.custom(Font.medium.rawValue, size: 11))
|
||||
.appFont(size: 11, weight: .medium)
|
||||
.foregroundColor(.gray77)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ struct ContentMainTabSeriesView: 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)
|
||||
|
||||
@@ -71,13 +71,13 @@ struct ContentMainOriginalAudioDramaItemView: View {
|
||||
.frame(width: itemWidth, height: (itemWidth * 636) / 450, alignment: .center)
|
||||
|
||||
Text(item.title)
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.grayee)
|
||||
.lineLimit(1)
|
||||
|
||||
if isAll {
|
||||
Text(item.publishedDaysOfWeek)
|
||||
.font(.custom(Font.medium.rawValue, size: 11))
|
||||
.appFont(size: 11, weight: .medium)
|
||||
.foregroundColor(Color.gray77)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user