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

캔 충전 

- 탭 순서 변경 ( 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
SodaLive/Sources/MyPage/Can/Charge/CanChargeView.swift
View File

@ -17,7 +17,7 @@ struct CanChargeView: View {
@StateObject var storeManager = StoreManager() @StateObject var storeManager = StoreManager()
@StateObject var viewModel = CanChargeViewModel() @StateObject var viewModel = CanChargeViewModel()
@State var currentTab: CanChargeCurrentTab = .iap @State var currentTab: CanChargeCurrentTab = .pg
let refresh: () -> Void let refresh: () -> Void
let afterCompletionToGoBack: Bool let afterCompletionToGoBack: Bool
@ -146,22 +146,6 @@ struct CanChargeTabView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
let tabWidth = screenSize().width / 2 let tabWidth = screenSize().width / 2
CanChargeTab(
title: "인 앱 결제",
action: {
if currentTab != .iap {
currentTab = .iap
}
},
color: {
currentTab == .iap ?
Color(hex: "eeeeee") :
Color(hex: "777777")
},
width: tabWidth,
isShowDivider: { currentTab == .iap }
)
CanChargeTab( CanChargeTab(
title: "PG", title: "PG",
action: { action: {
@ -171,17 +155,33 @@ struct CanChargeTabView: View {
}, },
color: { color: {
currentTab == .pg ? currentTab == .pg ?
Color(hex: "eeeeee") : Color.grayee :
Color(hex: "777777") Color.gray77
}, },
width: tabWidth, width: tabWidth,
isShowDivider: { currentTab == .pg } isShowDivider: { currentTab == .pg }
) )
CanChargeTab(
title: "인 앱 결제",
action: {
if currentTab != .iap {
currentTab = .iap
}
},
color: {
currentTab == .iap ?
Color.grayee :
Color.gray77
},
width: tabWidth,
isShowDivider: { currentTab == .iap }
)
} }
Rectangle() Rectangle()
.frame(width: screenSize().width, height: 1) .frame(width: screenSize().width, height: 1)
.foregroundColor(Color(hex: "909090").opacity(0.5)) .foregroundColor(Color.gray90.opacity(0.5))
} }
} }
} }
@ -207,7 +207,7 @@ struct CanChargeTab: View {
Rectangle() Rectangle()
.frame(width: width, height: 3) .frame(width: width, height: 3)
.foregroundColor(Color(hex: "9970ff").opacity(isShowDivider() ? 1 : 0)) .foregroundColor(Color.button.opacity(isShowDivider() ? 1 : 0))
} }
.frame(height: 50) .frame(height: 50)
} }

2
SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift
View File

@ -95,7 +95,7 @@ struct NicknameUpdateView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center) .frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff")) .background(Color.button)
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

12
SodaLive/Sources/MyPage/Profile/Password/ModifyPasswordView.swift
View File

@ -21,7 +21,7 @@ struct ModifyPasswordView: View {
ScrollView(.vertical, showsIndicators: false) { ScrollView(.vertical, showsIndicators: false) {
Text("안전한 비밀번호로 내 내 정보를 보호하세요") Text("안전한 비밀번호로 내 내 정보를 보호하세요")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
.padding(.top, 40) .padding(.top, 40)
VStack(spacing: 26.7) { VStack(spacing: 26.7) {
@ -51,7 +51,7 @@ struct ModifyPasswordView: View {
Text("* 영문, 숫자 포함 8자 이상") Text("* 영문, 숫자 포함 8자 이상")
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "dd4500")) .foregroundColor(Color.mainRed3)
.frame(width: screenSize().width - 53.4, alignment: .leading) .frame(width: screenSize().width - 53.4, alignment: .leading)
.padding(.top, 13.7) .padding(.top, 13.7)
} }
@ -62,11 +62,11 @@ struct ModifyPasswordView: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: screenSize().width - 26.7) .frame(width: screenSize().width - 26.7)
.background(Color(hex: "9970ff")) .background(Color.button)
.cornerRadius(10) .cornerRadius(10)
.padding(.vertical, 13.7) .padding(.vertical, 13.7)
.frame(width: screenSize().width) .frame(width: screenSize().width)
.background(Color(hex: "222222")) .background(Color.gray22)
.cornerRadius(16.7, corners: [.topLeft, .topRight]) .cornerRadius(16.7, corners: [.topLeft, .topRight])
.onTapGesture { .onTapGesture {
hideKeyboard() hideKeyboard()
@ -75,7 +75,7 @@ struct ModifyPasswordView: View {
if proxy.safeAreaInsets.bottom > 0 { if proxy.safeAreaInsets.bottom > 0 {
Rectangle() Rectangle()
.foregroundColor(Color(hex: "222222")) .foregroundColor(Color.gray22)
.frame(width: proxy.size.width, height: 15.3) .frame(width: proxy.size.width, height: 15.3)
} }
} }
@ -95,7 +95,7 @@ struct ModifyPasswordView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center) .frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff")) .background(Color.button)
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

66
SodaLive/Sources/MyPage/Profile/ProfileUpdateView.swift
View File

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

6
SodaLive/Sources/MyPage/Profile/Tag/MemberTagView.swift
View File

@ -67,8 +67,8 @@ struct MemberTagView: View {
.font(.custom(Font.medium.rawValue, size: 14.7)) .font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor( .foregroundColor(
selectedTags.contains(tag.tag) ? selectedTags.contains(tag.tag) ?
Color(hex: "9970ff") : Color.button :
Color(hex: "bbbbbb") Color.graybb
) )
} }
.onTapGesture { .onTapGesture {
@ -85,7 +85,7 @@ struct MemberTagView: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: screenSize().width - 26.7) .frame(width: screenSize().width - 26.7)
.background(Color(hex: "9970ff")) .background(Color.button)
.cornerRadius(10) .cornerRadius(10)
.padding(.bottom, 26.7) .padding(.bottom, 26.7)
.onTapGesture { .onTapGesture {

24
SodaLive/Sources/MyPage/ReservationStatus/Cancel/LiveReservationCancelView.swift
View File

@ -40,15 +40,15 @@ struct LiveReservationCancelView: View {
HStack(spacing: 13.3) { HStack(spacing: 13.3) {
Text("다른 라이브 예약하기") Text("다른 라이브 예약하기")
.font(.custom(Font.medium.rawValue, size: 15)) .font(.custom(Font.medium.rawValue, size: 15))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color.button)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (screenSize().width - 40) / 2) .frame(width: (screenSize().width - 40) / 2)
.background(Color(hex: "9970ff").opacity(0.2)) .background(Color.button.opacity(0.2))
.cornerRadius(10) .cornerRadius(10)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 10) RoundedRectangle(cornerRadius: 10)
.stroke( .stroke(
Color(hex: "9970ff"), Color.button,
lineWidth: 1 lineWidth: 1
) )
) )
@ -61,7 +61,7 @@ struct LiveReservationCancelView: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (screenSize().width - 40) / 2) .frame(width: (screenSize().width - 40) / 2)
.background(Color(hex: "9970ff")) .background(Color.button)
.cornerRadius(10) .cornerRadius(10)
.onTapGesture { .onTapGesture {
AppState.shared.setAppStep(step: .canStatus(refresh: {})) AppState.shared.setAppStep(step: .canStatus(refresh: {}))
@ -84,7 +84,7 @@ struct LiveReservationCancelView: View {
Text(item.masterNickname) Text(item.masterNickname)
.font(.custom(Font.medium.rawValue, size: 11.3)) .font(.custom(Font.medium.rawValue, size: 11.3))
.foregroundColor(Color(hex: "bbbbbb")) .foregroundColor(Color.graybb)
.padding(.top, 10) .padding(.top, 10)
Text(item.title) Text(item.title)
@ -108,7 +108,7 @@ struct LiveReservationCancelView: View {
.padding(.top, 20) .padding(.top, 20)
Rectangle() Rectangle()
.foregroundColor(Color(hex: "909090").opacity(0.5)) .foregroundColor(Color.gray90.opacity(0.5))
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
.frame(width: screenSize().width, height: 1) .frame(width: screenSize().width, height: 1)
.padding(.top, 13.3) .padding(.top, 13.3)
@ -121,7 +121,7 @@ struct LiveReservationCancelView: View {
Text("예약취소 이유를 선택해주세요. 서비스 개선에 중요한 자료로 활용하겠습니다.") Text("예약취소 이유를 선택해주세요. 서비스 개선에 중요한 자료로 활용하겠습니다.")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
.frame(width: screenSize().width - 26.7, alignment: .leading) .frame(width: screenSize().width - 26.7, alignment: .leading)
} }
.padding(.top, 40) .padding(.top, 40)
@ -140,7 +140,7 @@ struct LiveReservationCancelView: View {
Text(reason) Text(reason)
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
if index == viewModel.cancelReasons.count - 1 { if index == viewModel.cancelReasons.count - 1 {
VStack(spacing: 6.7) { VStack(spacing: 6.7) {
@ -148,12 +148,12 @@ struct LiveReservationCancelView: View {
.autocapitalization(.none) .autocapitalization(.none)
.disableAutocorrection(true) .disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
.keyboardType(.webSearch) .keyboardType(.webSearch)
Rectangle() Rectangle()
.frame(height: 1) .frame(height: 1)
.foregroundColor(Color(hex: "909090").opacity(0.5)) .foregroundColor(Color.gray90.opacity(0.5))
} }
} }
} }
@ -180,7 +180,7 @@ struct LiveReservationCancelView: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: screenSize().width - 26.7) .frame(width: screenSize().width - 26.7)
.background(Color(hex: "9970ff")) .background(Color.button)
.cornerRadius(6.7) .cornerRadius(6.7)
.padding(.top, 90) .padding(.top, 90)
.padding(.bottom, 13.3) .padding(.bottom, 13.3)
@ -202,7 +202,7 @@ struct LiveReservationCancelView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center) .frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff")) .background(Color.button)
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

10
SodaLive/Sources/MyPage/ServiceCenter/FaqView.swift
View File

@ -23,11 +23,11 @@ struct FaqView: View {
HStack(alignment: .top, spacing: 6.7) { HStack(alignment: .top, spacing: 6.7) {
Text("Q") Text("Q")
.font(.custom(Font.bold.rawValue, size: 13.3)) .font(.custom(Font.bold.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color.button)
Text(faq.question) Text(faq.question)
.font(.custom(Font.medium.rawValue, size: 14.7)) .font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
Spacer() Spacer()
@ -43,16 +43,16 @@ struct FaqView: View {
HStack(alignment: .top, spacing: 6.7) { HStack(alignment: .top, spacing: 6.7) {
Text("A") Text("A")
.font(.custom(Font.bold.rawValue, size: 13.3)) .font(.custom(Font.bold.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color.button)
.padding(.top, 13.3) .padding(.top, 13.3)
RichText(html: faq.answer) RichText(html: faq.answer)
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "bbbbbb")) .foregroundColor(Color.graybb)
} }
.padding(.vertical, 20) .padding(.vertical, 20)
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.background(Color(hex: "222222")) .background(Color.gray22)
} }
} }
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)

2
SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterCategoryItemView.swift
View File

@ -18,7 +18,7 @@ struct ServiceCenterCategoryItemView: View {
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(.white) .foregroundColor(.white)
.frame(width: proxy.size.width, height: 46.7) .frame(width: proxy.size.width, height: 46.7)
.background(isSelected ? Color(hex: "9970ff") : Color(hex: "222222")) .background(isSelected ? Color.button : Color.gray22)
.cornerRadius(4.7) .cornerRadius(4.7)
} }
} }

2
SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterView.swift
View File

@ -76,7 +76,7 @@ struct ServiceCenterView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center) .frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff")) .background(Color.button)
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

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

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

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

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