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

콘텐츠 메인 탭 

- 하단에 회사정보 추가
This commit is contained in:
Yu Sung 2024-05-24 23:38:04 +09:00
parent e7cbabb285
commit 0a1b1865dd
2 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SodaLive/Sources/Content/Main/ContentMainView.swift
View File

@ -19,7 +19,7 @@ struct ContentMainView: View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
Text("콘텐츠 마켓") Text("콘텐츠 마켓")
.font(.custom(Font.bold.rawValue, size: 21.3)) .font(.custom(Font.bold.rawValue, size: 21.3))
.foregroundColor(Color(hex: "3bb9f1")) .foregroundColor(Color.button)
.padding(.bottom, 26.7) .padding(.bottom, 26.7)
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
@ -92,6 +92,22 @@ struct ContentMainView: View {
ContentMainCurationView() ContentMainCurationView()
.padding(.top, 40) .padding(.top, 40)
.padding(.bottom, 20) .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) .padding(.vertical, 13.3)

42
SodaLive/Sources/Settings/SettingsView.swift
View File

@ -24,7 +24,7 @@ struct SettingsView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
Text("공지사항") Text("공지사항")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
Spacer() Spacer()
@ -41,12 +41,12 @@ struct SettingsView: View {
Rectangle() Rectangle()
.frame(width: cardWidth - 26.7, height: 0.3) .frame(width: cardWidth - 26.7, height: 0.3)
.foregroundColor(Color(hex: "909090")) .foregroundColor(Color.gray90)
HStack(spacing: 0) { HStack(spacing: 0) {
Text("이벤트") Text("이벤트")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
Spacer() Spacer()
@ -63,12 +63,12 @@ struct SettingsView: View {
Rectangle() Rectangle()
.frame(width: cardWidth - 26.7, height: 0.3) .frame(width: cardWidth - 26.7, height: 0.3)
.foregroundColor(Color(hex: "909090")) .foregroundColor(Color.gray90)
HStack(spacing: 0) { HStack(spacing: 0) {
Text("알림 설정") Text("알림 설정")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
Spacer() Spacer()
@ -85,7 +85,7 @@ struct SettingsView: View {
} }
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
.frame(width: cardWidth) .frame(width: cardWidth)
.background(Color(hex: "222222")) .background(Color.gray22)
.cornerRadius(6.7) .cornerRadius(6.7)
.padding(.top, 26.7) .padding(.top, 26.7)
@ -93,7 +93,7 @@ struct SettingsView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
Text("이용약관") Text("이용약관")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
Spacer() Spacer()
@ -110,12 +110,12 @@ struct SettingsView: View {
Rectangle() Rectangle()
.frame(width: cardWidth - 26.7, height: 0.3) .frame(width: cardWidth - 26.7, height: 0.3)
.foregroundColor(Color(hex: "909090")) .foregroundColor(Color.gray90)
HStack(spacing: 0) { HStack(spacing: 0) {
Text("개인정보처리방침") Text("개인정보처리방침")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
Spacer() Spacer()
@ -132,14 +132,14 @@ struct SettingsView: View {
} }
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
.frame(width: cardWidth) .frame(width: cardWidth)
.background(Color(hex: "222222")) .background(Color.gray22)
.cornerRadius(6.7) .cornerRadius(6.7)
.padding(.top, 13.3) .padding(.top, 13.3)
HStack(spacing: 0) { HStack(spacing: 0) {
Text("앱 버전 정보") Text("앱 버전 정보")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
Spacer() Spacer()
@ -147,23 +147,27 @@ struct SettingsView: View {
Text("Ver \(version!)") Text("Ver \(version!)")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
} }
.padding(.horizontal, 16.7) .padding(.horizontal, 16.7)
.frame(width: cardWidth, height: 50) .frame(width: cardWidth, height: 50)
.background(Color(hex: "222222")) .background(Color.gray22)
.cornerRadius(6.7) .cornerRadius(6.7)
.padding(.top, 13.3) .padding(.top, 13.3)
Text(""" Text("""
- 회사명 : 주식회사 소다라이브 - 회사명 : 주식회사 소다라이브
- 대표자 : 이재형 - 대표자 : 이재형
- 주소 : 경기도 성남시 분당구 황새울로335번길 10, 5층 563A호 (서현동, 멜로즈 프라자) - 주소 : 경기도 성남시 분당구 황새울로335번길 10, 5층 563A호 (서현동, 멜로즈 프라자)
- 사업자등록번호 : 870-81-03220 - 사업자등록번호 : 870-81-03220
- 고객센터 : 02.2055.1477 - 고객센터 : 02.2055.1477
""") """)
.font(.custom(Font.medium.rawValue, size: 11)) .font(.custom(Font.medium.rawValue, size: 11))
.foregroundColor(Color(hex: "777777")) .foregroundColor(Color.gray77)
.frame(width: cardWidth, alignment: .leading) .frame(width: cardWidth, alignment: .leading)
.padding(.top, 13.3) .padding(.top, 13.3)
@ -171,9 +175,9 @@ struct SettingsView: View {
Text("로그아웃") Text("로그아웃")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
.frame(width: cardWidth, height: 50) .frame(width: cardWidth, height: 50)
.background(Color(hex: "222222")) .background(Color.gray22)
.cornerRadius(6.7) .cornerRadius(6.7)
.onTapGesture { .onTapGesture {
isShowLogoutDialog = true isShowLogoutDialog = true
@ -181,7 +185,7 @@ struct SettingsView: View {
Text("모든 기기에서 로그아웃") Text("모든 기기에서 로그아웃")
.font(.custom(Font.medium.rawValue, size: 14.7)) .font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor(Color(hex: "777777")) .foregroundColor(Color.gray77)
.padding(.top, 13.3) .padding(.top, 13.3)
.onTapGesture { .onTapGesture {
isShowLogoutAllDeviceDialog = true isShowLogoutAllDeviceDialog = true
@ -189,7 +193,7 @@ struct SettingsView: View {
Text("회원탈퇴") Text("회원탈퇴")
.font(.custom(Font.medium.rawValue, size: 14.7)) .font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor(Color(hex: "777777")) .foregroundColor(Color.gray77)
.underline() .underline()
.padding(.vertical, 26.7) .padding(.vertical, 26.7)
.onTapGesture { .onTapGesture {
@ -245,7 +249,7 @@ struct SettingsView: 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: "3bb9f1")) .background(Color.button)
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)