커스텀 폰트 pretendard-medium, gmarket-medium를 사용하고 있던 것을 appFont 모디
파이어를 사용하여 한국어는 pretendard, 그 외에는 시스템 폰트를 사용하도록 수정
This commit is contained in:
@@ -32,13 +32,13 @@ struct ContentPlaylistItemView: View {
|
||||
|
||||
if !item.desc.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
||||
Text(item.desc)
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.gray90)
|
||||
.lineLimit(1)
|
||||
}
|
||||
|
||||
Text("총 \(item.contentCount)개")
|
||||
.font(.custom(Font.medium.rawValue, size: 12))
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.foregroundColor(Color.gray90)
|
||||
.lineLimit(1)
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ struct ContentPlaylistListView: View {
|
||||
.foregroundColor(Color.grayee)
|
||||
|
||||
Text("자주 듣는 콘텐츠를\n재생목록으로 만들어 보세요.")
|
||||
.font(.custom(Font.medium.rawValue, size: 11))
|
||||
.appFont(size: 11, weight: .medium)
|
||||
.foregroundColor(Color.grayee)
|
||||
.multilineTextAlignment(.center)
|
||||
}
|
||||
@@ -46,11 +46,11 @@ struct ContentPlaylistListView: View {
|
||||
} else {
|
||||
HStack(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)
|
||||
|
||||
Spacer()
|
||||
@@ -77,7 +77,7 @@ struct ContentPlaylistListView: 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)
|
||||
|
||||
@@ -34,7 +34,7 @@ struct ContentPlaylistCreateView: View {
|
||||
Spacer()
|
||||
|
||||
Text("저장")
|
||||
.font(.custom(Font.medium.rawValue, size: 14.7))
|
||||
.appFont(size: 14.7, weight: .medium)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(minHeight: 48)
|
||||
.onTapGesture {
|
||||
@@ -57,7 +57,7 @@ struct ContentPlaylistCreateView: 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 {
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user