From 0a1b1865dd94775d9e0237f43fa2b9f97f359e48 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Fri, 24 May 2024 23:38:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=83=AD=20-=20=ED=95=98=EB=8B=A8=EC=97=90=20?= =?UTF-8?q?=ED=9A=8C=EC=82=AC=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Content/Main/ContentMainView.swift | 18 +++++++- SodaLive/Sources/Settings/SettingsView.swift | 42 ++++++++++--------- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/SodaLive/Sources/Content/Main/ContentMainView.swift b/SodaLive/Sources/Content/Main/ContentMainView.swift index 07d4fac..7d6c747 100644 --- a/SodaLive/Sources/Content/Main/ContentMainView.swift +++ b/SodaLive/Sources/Content/Main/ContentMainView.swift @@ -19,7 +19,7 @@ struct ContentMainView: View { VStack(alignment: .leading, spacing: 0) { Text("콘텐츠 마켓") .font(.custom(Font.bold.rawValue, size: 21.3)) - .foregroundColor(Color(hex: "3bb9f1")) + .foregroundColor(Color.button) .padding(.bottom, 26.7) .padding(.horizontal, 13.3) @@ -92,6 +92,22 @@ struct ContentMainView: View { ContentMainCurationView() .padding(.top, 40) .padding(.bottom, 20) + + Text(""" + - 회사명 : 주식회사 소다라이브 + + - 대표자 : 이재형 + + - 주소 : 경기도 성남시 분당구 황새울로335번길 10, 5층 563A호 (서현동, 멜로즈 프라자) + + - 사업자등록번호 : 870-81-03220 + + - 고객센터 : 02.2055.1477 + """) + .font(.custom(Font.medium.rawValue, size: 11)) + .foregroundColor(Color.gray77) + .padding(.top, 13.3) + .padding(.horizontal, 13.3) } } .padding(.vertical, 13.3) diff --git a/SodaLive/Sources/Settings/SettingsView.swift b/SodaLive/Sources/Settings/SettingsView.swift index 746a819..cfb4226 100644 --- a/SodaLive/Sources/Settings/SettingsView.swift +++ b/SodaLive/Sources/Settings/SettingsView.swift @@ -24,7 +24,7 @@ struct SettingsView: View { HStack(spacing: 0) { Text("공지사항") .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Spacer() @@ -41,12 +41,12 @@ struct SettingsView: View { Rectangle() .frame(width: cardWidth - 26.7, height: 0.3) - .foregroundColor(Color(hex: "909090")) + .foregroundColor(Color.gray90) HStack(spacing: 0) { Text("이벤트") .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Spacer() @@ -63,12 +63,12 @@ struct SettingsView: View { Rectangle() .frame(width: cardWidth - 26.7, height: 0.3) - .foregroundColor(Color(hex: "909090")) + .foregroundColor(Color.gray90) HStack(spacing: 0) { Text("알림 설정") .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Spacer() @@ -85,7 +85,7 @@ struct SettingsView: View { } .padding(.horizontal, 13.3) .frame(width: cardWidth) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(6.7) .padding(.top, 26.7) @@ -93,7 +93,7 @@ struct SettingsView: View { HStack(spacing: 0) { Text("이용약관") .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Spacer() @@ -110,12 +110,12 @@ struct SettingsView: View { Rectangle() .frame(width: cardWidth - 26.7, height: 0.3) - .foregroundColor(Color(hex: "909090")) + .foregroundColor(Color.gray90) HStack(spacing: 0) { Text("개인정보처리방침") .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Spacer() @@ -132,14 +132,14 @@ struct SettingsView: View { } .padding(.horizontal, 13.3) .frame(width: cardWidth) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(6.7) .padding(.top, 13.3) HStack(spacing: 0) { Text("앱 버전 정보") .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Spacer() @@ -147,23 +147,27 @@ struct SettingsView: View { Text("Ver \(version!)") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) } .padding(.horizontal, 16.7) .frame(width: cardWidth, height: 50) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(6.7) .padding(.top, 13.3) Text(""" - 회사명 : 주식회사 소다라이브 + - 대표자 : 이재형 + - 주소 : 경기도 성남시 분당구 황새울로335번길 10, 5층 563A호 (서현동, 멜로즈 프라자) + - 사업자등록번호 : 870-81-03220 + - 고객센터 : 02.2055.1477 """) .font(.custom(Font.medium.rawValue, size: 11)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .frame(width: cardWidth, alignment: .leading) .padding(.top, 13.3) @@ -171,9 +175,9 @@ struct SettingsView: View { Text("로그아웃") .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(width: cardWidth, height: 50) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(6.7) .onTapGesture { isShowLogoutDialog = true @@ -181,7 +185,7 @@ struct SettingsView: View { Text("모든 기기에서 로그아웃") .font(.custom(Font.medium.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .padding(.top, 13.3) .onTapGesture { isShowLogoutAllDeviceDialog = true @@ -189,7 +193,7 @@ struct SettingsView: View { Text("회원탈퇴") .font(.custom(Font.medium.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .underline() .padding(.vertical, 26.7) .onTapGesture { @@ -245,7 +249,7 @@ struct SettingsView: View { .padding(.horizontal, 6.7) .frame(width: geo.size.width - 66.7, alignment: .center) .font(.custom(Font.medium.rawValue, size: 12)) - .background(Color(hex: "3bb9f1")) + .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.leading) .fixedSize(horizontal: false, vertical: true)