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

비밀번호 재설정 

- 입력창 UI 수정
This commit is contained in:
Yu Sung 2025-03-24 11:42:21 +09:00
parent 38823558a9
commit 19250dc929
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SodaLive/Resources/Assets.xcassets/ic_headphones_purple.imageset/Contents.json → SodaLive/Resources/Assets.xcassets/ic_headphones_blue.imageset/Contents.json vendored
View File

@ -9,7 +9,7 @@
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "ic_headphones_purple.png", "filename" : "ic_headphones_blue.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }

BIN
SodaLive/Resources/Assets.xcassets/ic_headphones_blue.imageset/ic_headphones_blue.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
SodaLive/Resources/Assets.xcassets/ic_headphones_purple.imageset/ic_headphones_purple.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

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

@ -28,7 +28,7 @@ struct FindPasswordView: View {
.padding(.top, 40) .padding(.top, 40)
.padding(.horizontal, 26.7) .padding(.horizontal, 26.7)
Text("임시 비밀번호로 로그인 후, 마이페이지 > 프로필 설정에서\n비밀번호를 변경하고 이용하세요.") Text("임시 비밀번호로 로그인 후\n마이페이지 > 프로필 설정에서\n비밀번호를 변경하고 이용하세요.")
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "909090")) .foregroundColor(Color(hex: "909090"))
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
@ -36,13 +36,16 @@ struct FindPasswordView: View {
.padding(.top, 40) .padding(.top, 40)
.padding(.horizontal, 26.7) .padding(.horizontal, 26.7)
UserTextField( TextField("이메일을 입력하세요", text: $viewModel.email)
title: "이메일", .autocapitalization(.none)
hint: "이메일 주소를 입력해 주세요", .disableAutocorrection(true)
isSecure: false, .font(.custom(Font.medium.rawValue, size: 15))
variable: $viewModel.email, .foregroundColor(.grayee)
keyboardType: .emailAddress .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(.top, 40)
.padding(.horizontal, 26.7) .padding(.horizontal, 26.7)
@ -51,23 +54,23 @@ struct FindPasswordView: View {
.foregroundColor(Color.white) .foregroundColor(Color.white)
.frame(maxWidth: proxy.size.width - 26.7) .frame(maxWidth: proxy.size.width - 26.7)
.padding(.vertical, 16) .padding(.vertical, 16)
.background(Color(hex: "9970ff")) .background(Color.button)
.cornerRadius(6.7) .cornerRadius(6.7)
.padding(.top, 60) .padding(.top, 60)
.onTapGesture { viewModel.findPassword() } .onTapGesture { viewModel.findPassword() }
HStack(spacing: 13.3) { HStack(spacing: 13.3) {
Image("ic_headphones_purple") Image("ic_headphones_blue")
Text("고객센터로 문의하기") Text("고객센터로 문의하기")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(.button)
} }
.padding(.vertical, 10.7) .padding(.vertical, 10.7)
.padding(.horizontal, 18.7) .padding(.horizontal, 18.7)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 8) RoundedRectangle(cornerRadius: 8)
.stroke(Color(hex: "9970ff"), lineWidth: 1) .stroke(Color.button, lineWidth: 1)
) )
.padding(.top, 93) .padding(.top, 93)
.onTapGesture { .onTapGesture {

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

@ -26,6 +26,7 @@ struct LoginView: View {
.disableAutocorrection(true) .disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 15)) .font(.custom(Font.medium.rawValue, size: 15))
.foregroundColor(.grayee) .foregroundColor(.grayee)
.keyboardType(.emailAddress)
.padding(.vertical, 18) .padding(.vertical, 18)
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
.frame(height: 56) .frame(height: 56)
@ -58,7 +59,7 @@ struct LoginView: View {
.frame(height: 56) .frame(height: 56)
.background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7))) .background(RoundedRectangle(cornerRadius: 6.7).fill(Color.gray33.opacity(0.7)))
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
.padding(.top, 33.3) .padding(.top, 16)
Button(action: { viewModel.login() }) { Button(action: { viewModel.login() }) {
Text("로그인") Text("로그인")