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

캔 충전

Browse Source 
- 탭 순서 변경 ( pg, 인 앱 결제 순으로 )
This commit is contained in:
Yu Sung
2024-04-02 02:01:26 +09:00
parent 07b97b987b
commit 2f96ad1321
11 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ struct LoginView: View {
.font(.custom(Font.bold.rawValue, size: 15))
.frame(width: screenSize().width - 26.6, height: 46.7)
.foregroundColor(.white)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(6.7)
}
.padding(.top, 40)
@@ -51,16 +51,16 @@ struct LoginView: View {
HStack(spacing: 10) {
Text("비밀번호 재설정")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "bbbbbb"))
.foregroundColor(Color.graybb)
.onTapGesture { AppState.shared.setAppStep(step: .findPassword) }
Text("|")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "bbbbbb"))
.foregroundColor(Color.graybb)
Text("회원가입")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "bbbbbb"))
.foregroundColor(Color.graybb)
.onTapGesture { AppState.shared.setAppStep(step: .signUp) }
}
.padding(.top, 40)
@@ -76,7 +76,7 @@ struct LoginView: View {
.padding(.vertical, 13.3)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.center)
.cornerRadius(20)

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

@@ -35,11 +35,11 @@ struct SignUpView: View {
.foregroundColor(Color.white)
.padding(.vertical, 16)
.frame(width: screenSize().width - 53.4)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(10)
.padding(.vertical, 13.7)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(16.7)
.padding(.top, 13.3)
.onTapGesture { viewModel.nextStep() }
@@ -62,7 +62,7 @@ struct SignUpView: View {
Image("ic_camera")
.padding(10)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(30)
.offset(x: 40, y: 40)
}
@@ -85,7 +85,7 @@ struct SignUpView: View {
}
.padding(.vertical, 20)
.frame(width: screenSize().width - 26.7, alignment: .leading)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(6.7)
.padding(.top, 16.7)
@@ -94,11 +94,11 @@ struct SignUpView: View {
.foregroundColor(Color.white)
.padding(.vertical, 16)
.frame(width: screenSize().width - 53.4)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(10)
.padding(.vertical, 13.7)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(16.7)
.padding(.top, 13.3)
.onTapGesture { viewModel.signUp() }
@@ -139,7 +139,7 @@ struct SignUpView: View {
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true)
@@ -183,7 +183,7 @@ struct SignUpView: View {
}
.padding(.vertical, 20)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(6.7)
.padding(.top, 13.3)
}
@@ -193,7 +193,7 @@ struct SignUpView: View {
VStack(alignment: .leading, spacing: 13.3) {
Text("성별")
.font(.custom(Font.bold.rawValue, size: 12))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.padding(.leading, 6.7)
HStack(spacing: 0) {
@@ -207,7 +207,7 @@ struct SignUpView: View {
Text("여자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
}
.contentShape(Rectangle())
.onTapGesture {
@@ -228,7 +228,7 @@ struct SignUpView: View {
Text("남자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
}
.contentShape(Rectangle())
.onTapGesture {
@@ -249,7 +249,7 @@ struct SignUpView: View {
Text("공개 안 함")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
}
.contentShape(Rectangle())
.onTapGesture {
@@ -270,21 +270,21 @@ struct SignUpView: View {
VStack(spacing: 0) {
Text("약관 동의")
.font(.custom(Font.bold.rawValue, size: 12))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.frame(width: screenSize().width - 60, height: 50, alignment: .leading)
Rectangle()
.frame(width: screenSize().width - 53.4, height: 1)
.foregroundColor(Color(hex: "909090"))
.foregroundColor(Color.gray90)
HStack(spacing: 6.7) {
Text("이용약관 (필수)")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
Text("(필수)")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
Spacer()
@@ -303,16 +303,16 @@ struct SignUpView: View {
Rectangle()
.frame(width: screenSize().width - 53.4, height: 1)
.foregroundColor(Color(hex: "909090"))
.foregroundColor(Color.gray90)
HStack(spacing: 6.7) {
Text("개인정보수집 동의")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
Text("(필수)")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
Spacer()
@@ -331,11 +331,11 @@ struct SignUpView: View {
Rectangle()
.frame(width: screenSize().width - 53.4, height: 1)
.foregroundColor(Color(hex: "909090"))
.foregroundColor(Color.gray90)
}
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(6.7)
}
}