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