klaus
/
sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

로그인, 비밀번호 찾기, 회원가입 

- TextField 터치영역 개선
This commit is contained in:
Yu Sung 2025-03-31 21:12:24 +09:00
parent 1f72e72627
commit 711ffbcb83
3 changed files with 86 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SodaLive/Sources/User/FindPassword/FindPasswordView.swift
View File

@ -11,6 +11,7 @@ struct FindPasswordView: View {
@StateObject var viewModel = FindPasswordViewModel()
@StateObject var keyboardHandler = KeyboardHandler()
@FocusState private var isFocused: Bool
var body: some View {
BaseView(isLoading: $viewModel.isLoading) {
@ -37,6 +38,7 @@ struct FindPasswordView: View {
.padding(.horizontal, 26.7)
TextField("이메일을 입력하세요", text: $viewModel.email)
.focused($isFocused)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 15))
@ -48,6 +50,9 @@ struct FindPasswordView: View {
.background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7)))
.padding(.top, 40)
.padding(.horizontal, 26.7)
.onTapGesture {
isFocused = true
}
Text("임시 비밀번호 받기")
.font(.custom(Font.bold.rawValue, size: 18.3))
@ -79,6 +84,9 @@ struct FindPasswordView: View {
}
}
}
.onAppear {
isFocused = true
}
}
}
.popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .bottom, autohideIn: 2) {

38
SodaLive/Sources/User/Login/LoginView.swift
View File

@ -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

48
SodaLive/Sources/User/SignUp/SignUpView.swift
View File

@ -9,10 +9,16 @@ import SwiftUI
struct SignUpView: View {
enum FocusField: Hashable {
case email, password
}
@ObservedObject var viewModel = SignUpViewModel()
@StateObject var keyboardHandler = KeyboardHandler()
@State private var isPasswordVisible: Bool = false
@FocusState private var focusedField: FocusField?
var body: some View {
BaseView(isLoading: $viewModel.isLoading) {
GeometryReader { proxy in
@ -22,6 +28,8 @@ struct SignUpView: View {
ScrollView(.vertical, showsIndicators: false) {
VStack(spacing: 0) {
TextField("이메일", text: $viewModel.email)
.submitLabel(.next)
.focused($focusedField, equals: .email)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 15))
@ -33,6 +41,12 @@ struct SignUpView: View {
.background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7)))
.padding(.horizontal, 13.3)
.padding(.top, 13.3)
.onSubmit {
self.focusedField = .password
}
.onTapGesture {
self.focusedField = .email
}
HStack {
Group {
@ -42,6 +56,8 @@ struct SignUpView: View {
SecureField("비밀번호", text: $viewModel.password)
}
}
.submitLabel(.done)
.focused($focusedField, equals: .password)
.autocapitalization(.none)
.disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 15))
@ -52,6 +68,7 @@ struct SignUpView: View {
Image(systemName: isPasswordVisible ? "eye.slash.fill" : "eye.fill")
.foregroundColor(.grayee)
.onTapGesture {
hideKeyboard()
isPasswordVisible.toggle()
}
}
@ -61,6 +78,9 @@ struct SignUpView: View {
.background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7)))
.padding(.horizontal, 13.3)
.padding(.top, 16)
.onTapGesture {
self.focusedField = .password
}
VStack(spacing: 5) {
HStack(spacing: 10) {
@ -70,7 +90,10 @@ struct SignUpView: View {
"btn_select_normal"
)
.padding(10)
.onTapGesture { viewModel.isAgreeTerms.toggle() }
.onTapGesture {
hideKeyboard()
viewModel.isAgreeTerms.toggle()
}
HStack(spacing: 5) {
Text("이용약관")
@ -88,7 +111,10 @@ struct SignUpView: View {
Spacer()
}
.contentShape(Rectangle())
.onTapGesture { viewModel.isAgreeTerms.toggle() }
.onTapGesture {
hideKeyboard()
viewModel.isAgreeTerms.toggle()
}
HStack(spacing: 10) {
Image(
@ -97,7 +123,10 @@ struct SignUpView: View {
"btn_select_normal"
)
.padding(10)
.onTapGesture { viewModel.isAgreePrivacyPolicy.toggle() }
.onTapGesture {
hideKeyboard()
viewModel.isAgreePrivacyPolicy.toggle()
}
HStack(spacing: 5) {
Text("개인정보수집 및 이용동의")
@ -115,7 +144,10 @@ struct SignUpView: View {
Spacer()
}
.contentShape(Rectangle())
.onTapGesture { viewModel.isAgreePrivacyPolicy.toggle() }
.onTapGesture {
hideKeyboard()
viewModel.isAgreePrivacyPolicy.toggle()
}
}
.padding(.top, 20)
.padding(.horizontal, 13.3)
@ -129,7 +161,10 @@ struct SignUpView: View {
.cornerRadius(10)
.padding(.horizontal, 13.3)
.contentShape(Rectangle())
.onTapGesture { viewModel.signUp() }
.onTapGesture {
hideKeyboard()
viewModel.signUp()
}
.padding(.top, 26.7)
Rectangle()
@ -145,6 +180,9 @@ struct SignUpView: View {
}
}
.edgesIgnoringSafeArea(.bottom)
.onAppear {
focusedField = .email
}
.onTapGesture {
hideKeyboard()
}