diff --git a/SodaLive/Resources/Assets.xcassets/ic_headphones_purple.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_headphones_blue.imageset/Contents.json similarity index 85% rename from SodaLive/Resources/Assets.xcassets/ic_headphones_purple.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/ic_headphones_blue.imageset/Contents.json index 5f15106..98d32ae 100644 --- a/SodaLive/Resources/Assets.xcassets/ic_headphones_purple.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/ic_headphones_blue.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "ic_headphones_purple.png", + "filename" : "ic_headphones_blue.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/ic_headphones_blue.imageset/ic_headphones_blue.png b/SodaLive/Resources/Assets.xcassets/ic_headphones_blue.imageset/ic_headphones_blue.png new file mode 100644 index 0000000..2ee3164 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_headphones_blue.imageset/ic_headphones_blue.png differ diff --git a/SodaLive/Resources/Assets.xcassets/ic_headphones_purple.imageset/ic_headphones_purple.png b/SodaLive/Resources/Assets.xcassets/ic_headphones_purple.imageset/ic_headphones_purple.png deleted file mode 100644 index d285d38..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/ic_headphones_purple.imageset/ic_headphones_purple.png and /dev/null differ diff --git a/SodaLive/Sources/User/FindPassword/FindPasswordView.swift b/SodaLive/Sources/User/FindPassword/FindPasswordView.swift index 9ac78dd..9a3fdbb 100644 --- a/SodaLive/Sources/User/FindPassword/FindPasswordView.swift +++ b/SodaLive/Sources/User/FindPassword/FindPasswordView.swift @@ -28,7 +28,7 @@ struct FindPasswordView: View { .padding(.top, 40) .padding(.horizontal, 26.7) - Text("임시 비밀번호로 로그인 후, 마이페이지 > 프로필 설정에서\n비밀번호를 변경하고 이용하세요.") + Text("임시 비밀번호로 로그인 후\n마이페이지 > 프로필 설정에서\n비밀번호를 변경하고 이용하세요.") .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "909090")) .multilineTextAlignment(.center) @@ -36,38 +36,41 @@ struct FindPasswordView: View { .padding(.top, 40) .padding(.horizontal, 26.7) - UserTextField( - title: "이메일", - hint: "이메일 주소를 입력해 주세요", - isSecure: false, - variable: $viewModel.email, - keyboardType: .emailAddress - ) - .padding(.top, 40) - .padding(.horizontal, 26.7) + TextField("이메일을 입력하세요", text: $viewModel.email) + .autocapitalization(.none) + .disableAutocorrection(true) + .font(.custom(Font.medium.rawValue, size: 15)) + .foregroundColor(.grayee) + .keyboardType(.emailAddress) + .padding(.vertical, 18) + .padding(.horizontal, 13.3) + .frame(height: 56) + .background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7))) + .padding(.top, 40) + .padding(.horizontal, 26.7) Text("임시 비밀번호 받기") .font(.custom(Font.bold.rawValue, size: 18.3)) .foregroundColor(Color.white) .frame(maxWidth: proxy.size.width - 26.7) .padding(.vertical, 16) - .background(Color(hex: "9970ff")) + .background(Color.button) .cornerRadius(6.7) .padding(.top, 60) .onTapGesture { viewModel.findPassword() } HStack(spacing: 13.3) { - Image("ic_headphones_purple") + Image("ic_headphones_blue") Text("고객센터로 문의하기") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "9970ff")) + .foregroundColor(.button) } .padding(.vertical, 10.7) .padding(.horizontal, 18.7) .overlay( RoundedRectangle(cornerRadius: 8) - .stroke(Color(hex: "9970ff"), lineWidth: 1) + .stroke(Color.button, lineWidth: 1) ) .padding(.top, 93) .onTapGesture { diff --git a/SodaLive/Sources/User/Login/LoginView.swift b/SodaLive/Sources/User/Login/LoginView.swift index bdf230a..db954ac 100644 --- a/SodaLive/Sources/User/Login/LoginView.swift +++ b/SodaLive/Sources/User/Login/LoginView.swift @@ -26,6 +26,7 @@ struct LoginView: View { .disableAutocorrection(true) .font(.custom(Font.medium.rawValue, size: 15)) .foregroundColor(.grayee) + .keyboardType(.emailAddress) .padding(.vertical, 18) .padding(.horizontal, 13.3) .frame(height: 56) @@ -58,7 +59,7 @@ struct LoginView: View { .frame(height: 56) .background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7))) .padding(.horizontal, 13.3) - .padding(.top, 33.3) + .padding(.top, 16) Button(action: { viewModel.login() }) { Text("로그인")