커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user