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