로그인, 비밀번호 찾기, 회원가입
- TextField 터치영역 개선
This commit is contained in:
@@ -10,9 +10,14 @@ import PopupView
|
||||
|
||||
struct LoginView: View {
|
||||
|
||||
enum FocusField: Hashable {
|
||||
case email, password
|
||||
}
|
||||
|
||||
@ObservedObject var viewModel = LoginViewModel()
|
||||
|
||||
@State private var isPasswordVisible: Bool = false
|
||||
@FocusState private var focusedField: FocusField?
|
||||
|
||||
var body: some View {
|
||||
BaseView(isLoading: $viewModel.isLoading) {
|
||||
@@ -22,6 +27,8 @@ struct LoginView: View {
|
||||
Spacer()
|
||||
|
||||
TextField("이메일", text: $viewModel.email)
|
||||
.submitLabel(.next)
|
||||
.focused($focusedField, equals: .email)
|
||||
.autocapitalization(.none)
|
||||
.disableAutocorrection(true)
|
||||
.font(.custom(Font.medium.rawValue, size: 15))
|
||||
@@ -32,6 +39,12 @@ struct LoginView: View {
|
||||
.frame(height: 56)
|
||||
.background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7)))
|
||||
.padding(.horizontal, 13.3)
|
||||
.onSubmit {
|
||||
self.focusedField = .password
|
||||
}
|
||||
.onTapGesture {
|
||||
self.focusedField = .email
|
||||
}
|
||||
|
||||
HStack {
|
||||
Group {
|
||||
@@ -41,6 +54,8 @@ struct LoginView: View {
|
||||
SecureField("비밀번호", text: $viewModel.password)
|
||||
}
|
||||
}
|
||||
.submitLabel(.done)
|
||||
.focused($focusedField, equals: .password)
|
||||
.autocapitalization(.none)
|
||||
.disableAutocorrection(true)
|
||||
.font(.custom(Font.medium.rawValue, size: 15))
|
||||
@@ -60,8 +75,16 @@ struct LoginView: View {
|
||||
.background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7)))
|
||||
.padding(.horizontal, 13.3)
|
||||
.padding(.top, 16)
|
||||
.onTapGesture {
|
||||
self.focusedField = .password
|
||||
}
|
||||
|
||||
Button(action: { viewModel.login() }) {
|
||||
Button(
|
||||
action: {
|
||||
hideKeyboard()
|
||||
viewModel.login()
|
||||
}
|
||||
) {
|
||||
Text("로그인")
|
||||
.font(.custom(Font.bold.rawValue, size: 15))
|
||||
.frame(width: screenSize().width - 26.6, height: 46.7)
|
||||
@@ -75,18 +98,27 @@ struct LoginView: View {
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.foregroundColor(Color.graybb)
|
||||
.padding(.vertical, 10)
|
||||
.onTapGesture { AppState.shared.setAppStep(step: .findPassword) }
|
||||
.onTapGesture {
|
||||
hideKeyboard()
|
||||
AppState.shared.setAppStep(step: .findPassword)
|
||||
}
|
||||
.padding(.top, 30)
|
||||
|
||||
Text("보이스온 회원이 아닌가요? 지금 가입하세요.")
|
||||
.font(.custom(Font.medium.rawValue, size: 13.3))
|
||||
.foregroundColor(Color.graybb)
|
||||
.padding(.vertical, 10)
|
||||
.onTapGesture { AppState.shared.setAppStep(step: .signUp) }
|
||||
.onTapGesture {
|
||||
hideKeyboard()
|
||||
AppState.shared.setAppStep(step: .signUp)
|
||||
}
|
||||
.padding(.top, 20)
|
||||
|
||||
Spacer()
|
||||
}
|
||||
.onAppear {
|
||||
self.focusedField = .email
|
||||
}
|
||||
}
|
||||
.popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .top, autohideIn: 2) {
|
||||
GeometryReader { geo in
|
||||
|
||||
Reference in New Issue
Block a user