캔 충전

- 탭 순서 변경 ( 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

View File

@@ -23,18 +23,18 @@ struct ProfileUpdateView: View {
VStack(alignment: .leading, spacing: 0) {
Text("이메일")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.padding(.leading, 6.7)
Text(viewModel.email)
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "777777"))
.foregroundColor(Color.gray77)
.padding(.top, 12)
.padding(.leading, 6.7)
Divider()
.frame(height: 0.3)
.foregroundColor(Color(hex: "909090"))
.foregroundColor(Color.gray90)
.padding(.top, 8.3)
}
@@ -42,18 +42,18 @@ struct ProfileUpdateView: View {
VStack(alignment: .leading, spacing: 0) {
Text("비밀번호")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.padding(.leading, 6.7)
Text("********")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "777777"))
.foregroundColor(Color.gray77)
.padding(.top, 12)
.padding(.leading, 6.7)
Divider()
.frame(height: 0.3)
.foregroundColor(Color(hex: "909090"))
.foregroundColor(Color.gray90)
.padding(.top, 8.3)
}
@@ -63,7 +63,7 @@ struct ProfileUpdateView: View {
.foregroundColor(Color.white)
.padding(.vertical, 13.3)
.padding(.horizontal, 22.7)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(8)
}
}
@@ -71,7 +71,7 @@ struct ProfileUpdateView: View {
.padding(.vertical, 20)
.padding(.horizontal, 13.3)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(6.7)
}
@@ -82,18 +82,18 @@ struct ProfileUpdateView: View {
VStack(alignment: .leading, spacing: 0) {
Text("닉네임")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.padding(.leading, 6.7)
Text(viewModel.nickname)
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.padding(.top, 12)
.padding(.leading, 6.7)
Divider()
.frame(height: 0.3)
.foregroundColor(Color(hex: "909090"))
.foregroundColor(Color.gray90)
.padding(.top, 8.3)
}
@@ -103,7 +103,7 @@ struct ProfileUpdateView: View {
.foregroundColor(Color.white)
.padding(.vertical, 13.3)
.padding(.horizontal, 22.7)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(8)
}
}
@@ -111,7 +111,7 @@ struct ProfileUpdateView: View {
VStack(alignment: .leading, spacing: 13.3) {
Text("성별")
.font(.custom(Font.bold.rawValue, size: 12))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.button)
.padding(.leading, 6.7)
HStack(spacing: 0) {
@@ -123,7 +123,7 @@ struct ProfileUpdateView: View {
Text("여자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
}
}
@@ -137,7 +137,7 @@ struct ProfileUpdateView: View {
Text("남자")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
}
}
@@ -151,7 +151,7 @@ struct ProfileUpdateView: View {
Text("공개 안 함")
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
}
}
@@ -163,7 +163,7 @@ struct ProfileUpdateView: View {
.padding(.vertical, 20)
.padding(.horizontal, 13.3)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(6.7)
}
@@ -201,7 +201,7 @@ struct ProfileUpdateView: View {
.padding(.vertical, 20)
.padding(.horizontal, 13.3)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(6.7)
}
@@ -210,7 +210,7 @@ struct ProfileUpdateView: View {
VStack(alignment: .leading, spacing: 13.3) {
Text("관심사")
.font(.custom(Font.bold.rawValue, size: 16.7))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
Button(action: {
hideKeyboard()
@@ -218,15 +218,15 @@ struct ProfileUpdateView: View {
}) {
Text("관심사 선택")
.font(.custom(Font.bold.rawValue, size: 16.7))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.padding(.vertical, 13.7)
.frame(width: screenSize().width - 53.4)
.background(Color(hex: "9970ff").opacity(0.2))
.background(Color.button.opacity(0.2))
.cornerRadius(24.3)
.overlay(
RoundedRectangle(cornerRadius: 24.3)
.stroke()
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
)
}
@@ -246,7 +246,7 @@ struct ProfileUpdateView: View {
}
}
.padding(10)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(24.3)
}
}
@@ -256,7 +256,7 @@ struct ProfileUpdateView: View {
.padding(.vertical, 20)
.padding(.horizontal, 13.3)
.frame(width: screenSize().width - 26.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(6.7)
}
@@ -265,7 +265,7 @@ struct ProfileUpdateView: View {
VStack(alignment: .leading, spacing: 13.3) {
Text("소개글")
.font(.custom(Font.bold.rawValue, size: 16.7))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
TextViewWrapper(
text: $viewModel.introduce,
@@ -307,7 +307,7 @@ struct ProfileUpdateView: View {
Image("ic_camera")
.padding(10)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(30)
.offset(x: 25, y: 25)
}
@@ -343,12 +343,12 @@ struct ProfileUpdateView: View {
.font(.custom(Font.bold.rawValue, size: 18.3))
.foregroundColor(Color.white)
.frame(width: screenSize().width - 26.7, height: 50)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(10)
.padding(.vertical, 13.7)
.padding(.horizontal, 13.3)
.frame(width: screenSize().width)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(16.7, corners: [.topLeft, .topRight])
.padding(.top, 26.7)
.onTapGesture {
@@ -357,7 +357,7 @@ struct ProfileUpdateView: View {
if proxy.safeAreaInsets.bottom > 0 {
Rectangle()
.foregroundColor(Color(hex: "222222"))
.foregroundColor(Color.gray22)
.frame(width: proxy.size.width, height: 15.3)
}
}
@@ -373,12 +373,12 @@ struct ProfileUpdateView: View {
.font(.custom(Font.bold.rawValue, size: 18.3))
.foregroundColor(Color.white)
.frame(width: screenSize().width - 26.7, height: 50)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(10)
.padding(.vertical, 13.7)
.padding(.horizontal, 13.3)
.frame(width: screenSize().width)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(16.7, corners: [.topLeft, .topRight])
.padding(.top, 13.3)
.onTapGesture {
@@ -387,7 +387,7 @@ struct ProfileUpdateView: View {
if proxy.safeAreaInsets.bottom > 0 {
Rectangle()
.foregroundColor(Color(hex: "222222"))
.foregroundColor(Color.gray22)
.frame(width: proxy.size.width, height: 15.3)
}
}
@@ -443,7 +443,7 @@ struct ProfileUpdateView: 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)