From 64e02108a98c0ecebee1c5b9b334e76cc36ea331 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Fri, 8 Nov 2024 17:52:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20-=20=EC=BB=AC=EB=9F=AC=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Content/Create/ContentCreateView.swift | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/SodaLive/Sources/Content/Create/ContentCreateView.swift b/SodaLive/Sources/Content/Create/ContentCreateView.swift index db75107..da801bd 100644 --- a/SodaLive/Sources/Content/Create/ContentCreateView.swift +++ b/SodaLive/Sources/Content/Create/ContentCreateView.swift @@ -30,7 +30,7 @@ struct ContentCreateView: View { VStack(spacing: 0) { Text("썸네일") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) ZStack { @@ -39,7 +39,7 @@ struct ContentCreateView: View { .resizable() .scaledToFill() .frame(width: 107, height: 107) - .background(Color(hex: "13181b")) + .background(Color.bg) .cornerRadius(8) .clipped() } else { @@ -48,13 +48,13 @@ struct ContentCreateView: View { .scaledToFit() .padding(13.3) .frame(width: 107, height: 107) - .background(Color(hex: "13181b")) + .background(Color.bg) .cornerRadius(8) } Image("ic_camera") .padding(10) - .background(Color(hex: "3bb9f1")) + .background(Color.button) .cornerRadius(30) .offset(x: 50, y: 36) } @@ -63,21 +63,21 @@ struct ContentCreateView: View { Text("등록") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 13.3) Text(viewModel.fileName.trimmingCharacters(in: .whitespacesAndNewlines) == "" ? "파일선택" : viewModel.fileName) .font(.custom(Font.medium.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "3bb9f1")) + .foregroundColor(Color.button) .padding(.vertical, 10) .frame(maxWidth: .infinity) - .background(Color(hex: "13181b")) + .background(Color.bg) .cornerRadius(5.3) .overlay( RoundedCorner(radius: 8) .stroke(lineWidth: 2) - .foregroundColor(Color(hex: "3bb9f1")) + .foregroundColor(Color.button) ) .padding(.top, 13.3) .onTapGesture { isShowSelectAudioView = true } @@ -86,24 +86,24 @@ struct ContentCreateView: View { .padding(.horizontal, 13.3) Rectangle() - .foregroundColor(Color(hex: "232323")) + .foregroundColor(Color.gray23) .frame(height: 6.7) .padding(.top, 26.7) VStack(spacing: 0) { Text("제목") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) TextField("제목을 입력하세요", text: $viewModel.title) .autocapitalization(.none) .disableAutocorrection(true) .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .padding(.vertical, 16.7) .padding(.horizontal, 13.3) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(6.7) .keyboardType(.default) .padding(.top, 13.3) @@ -111,16 +111,16 @@ struct ContentCreateView: View { HStack(spacing: 0) { Text("내용") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Spacer() Text("\(viewModel.detail.count)자") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "ff5c49")) + + .foregroundColor(Color.mainRed) + Text(" / 최대 500자") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) } .padding(.top, 26.7) @@ -136,7 +136,7 @@ struct ContentCreateView: View { Text("테마") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 26.7) @@ -159,16 +159,16 @@ struct ContentCreateView: View { viewModel.theme!.theme : "테마 선택") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "3bb9f1")) + .foregroundColor(Color.button) } .padding(.vertical, viewModel.theme != nil ? 8 : 13.3) .frame(maxWidth: .infinity) - .background(Color(hex: "13181b")) + .background(Color.bg) .cornerRadius(24) .overlay( RoundedRectangle(cornerRadius: 24) .stroke(lineWidth: 2) - .foregroundColor(Color(hex: "3bb9f1")) + .foregroundColor(Color.button) ) .padding(.top, 13.3) .onTapGesture { @@ -178,7 +178,7 @@ struct ContentCreateView: View { Text("태그") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 26.7) @@ -186,10 +186,10 @@ struct ContentCreateView: View { .autocapitalization(.none) .disableAutocorrection(true) .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .padding(.vertical, 16.7) .padding(.horizontal, 13.3) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(6.7) .keyboardType(.default) .padding(.top, 13.3) @@ -198,14 +198,14 @@ struct ContentCreateView: View { .padding(.horizontal, 13.3) Rectangle() - .foregroundColor(Color(hex: "232323")) + .foregroundColor(Color.gray23) .frame(height: 6.7) .padding(.top, 26.7) VStack(spacing: 13.3) { Text("가격 설정") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) HStack(spacing: 13.3) { @@ -280,18 +280,18 @@ struct ContentCreateView: View { Text("※ 이용기간 대여 (15일) | 소장 (서비스종료시까지)") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 13.3) Text("※ 대여가격은 소장가격의 70%로 자동 반영") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .frame(maxWidth: .infinity, alignment: .leading) Text("※ 콘텐츠의 최소금액은 5캔 입니다") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .frame(maxWidth: .infinity, alignment: .leading) } .padding(.top, 26.7) @@ -337,7 +337,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("미리듣기") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) HStack(spacing: 13.3) { @@ -360,29 +360,29 @@ struct ContentCreateView: View { VStack(spacing: 10) { Text("미리듣기 시간 설정") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) Text("미리듣기 시간을 직접 설정하지 않으면 콘텐츠 앞부분 15초가 자동으로 설정됩니다. 미리듣기의 시간제한은 없습니다.") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .frame(maxWidth: .infinity, alignment: .leading) HStack(spacing: 13.3) { VStack(spacing: 5.3) { Text("시작 시간") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "d2d2d2")) + .foregroundColor(Color.grayd2) .frame(maxWidth: .infinity, alignment: .leading) TextField("00:00:00", text: $viewModel.previewStartTime) .autocapitalization(.none) .disableAutocorrection(true) .font(.custom(Font.bold.rawValue, size: 14.6)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .padding(.vertical, 16.7) .padding(.horizontal, 13.3) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(6.7) .keyboardType(.default) .multilineTextAlignment(.center) @@ -391,17 +391,17 @@ struct ContentCreateView: View { VStack(spacing: 5.3) { Text("종료 시간") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "d2d2d2")) + .foregroundColor(Color.grayd2) .frame(maxWidth: .infinity, alignment: .leading) TextField("00:00:15", text: $viewModel.previewEndTime) .autocapitalization(.none) .disableAutocorrection(true) .font(.custom(Font.bold.rawValue, size: 14.6)) - .foregroundColor(Color(hex: "777777")) + .foregroundColor(Color.gray77) .padding(.vertical, 16.7) .padding(.horizontal, 13.3) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(6.7) .keyboardType(.default) .multilineTextAlignment(.center) @@ -419,7 +419,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("연령 제한") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) HStack(spacing: 13.3) { @@ -438,7 +438,7 @@ struct ContentCreateView: View { Text("성인콘텐츠를 전체관람가로 등록할 시 발생하는 법적 책임은 회사와 상관없이 콘텐츠를 등록한 본인에게 있습니다.\n콘텐츠 내용은 물론 제목도 19금 여부를 체크해 주시기 바랍니다.") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "DD4500")) + .foregroundColor(Color.mainRed3) .frame(maxWidth: .infinity, alignment: .leading) .padding(.top, 13.3) } @@ -448,7 +448,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("댓글 가능 여부") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) HStack(spacing: 13.3) { @@ -471,7 +471,7 @@ struct ContentCreateView: View { VStack(spacing: 13.3) { Text("예약 공개") .font(.custom(Font.bold.rawValue, size: 16.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity, alignment: .leading) HStack(spacing: 13.3) { @@ -493,7 +493,7 @@ struct ContentCreateView: View { VStack(alignment: .leading, spacing: 6.7) { Text("예약 날짜") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Button(action: { hideKeyboard() @@ -501,12 +501,12 @@ struct ContentCreateView: View { }) { Text(viewModel.releaseDateString) .font(.custom(Font.medium.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity) .frame(height: 48.7) .overlay( RoundedRectangle(cornerRadius: 6.7) - .stroke(Color(hex: "3bb9f1"), lineWidth: 1.3) + .stroke(Color.button, lineWidth: 1.3) ) } } @@ -514,7 +514,7 @@ struct ContentCreateView: View { VStack(alignment: .leading, spacing: 6.7) { Text("예약 시간") .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) Button(action: { hideKeyboard() @@ -522,12 +522,12 @@ struct ContentCreateView: View { }) { Text(viewModel.releaseTimeString) .font(.custom(Font.medium.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(Color.grayee) .frame(maxWidth: .infinity) .frame(height: 48.7) .overlay( RoundedRectangle(cornerRadius: 6.7) - .stroke(Color(hex: "3bb9f1"), lineWidth: 1.3) + .stroke(Color.button, lineWidth: 1.3) ) } } @@ -535,7 +535,7 @@ struct ContentCreateView: View { .padding(.horizontal, 13.3) .padding(.vertical, 14.2) .frame(maxWidth: .infinity) - .background(Color(hex: "222222")) + .background(Color.gray22) .padding(.top, 22.7) } } @@ -549,12 +549,12 @@ struct ContentCreateView: View { .foregroundColor(Color.white) .frame(height: 50) .frame(maxWidth: .infinity) - .background(Color(hex: "3bb9f1")) + .background(Color.button) .cornerRadius(10) .padding(13.3) } .frame(maxWidth: .infinity) - .background(Color(hex: "222222")) + .background(Color.gray22) .cornerRadius(16.7, corners: [.topLeft, .topRight]) .onTapGesture { hideKeyboard() @@ -562,13 +562,13 @@ struct ContentCreateView: View { } Rectangle() - .foregroundColor(Color(hex: "222222")) + .foregroundColor(Color.gray22) .frame(height: keyboardHandler.keyboardHeight) .frame(maxWidth: .infinity) if proxy.safeAreaInsets.bottom > 0 { Rectangle() - .foregroundColor(Color(hex: "222222")) + .foregroundColor(Color.gray22) .frame(height: 15.3) .frame(maxWidth: .infinity) } @@ -644,7 +644,7 @@ struct ContentCreateView: View { .padding(.vertical, 13.3) .frame(width: screenSize().width - 66.7, alignment: .center) .font(.custom(Font.medium.rawValue, size: 12)) - .background(Color(hex: "3bb9f1")) + .background(Color.button) .foregroundColor(Color.white) .multilineTextAlignment(.center) .cornerRadius(20) @@ -672,11 +672,11 @@ struct SelectButtonView: View { Text(title) .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(isChecked ? .white : Color(hex: "80D8FF")) + .foregroundColor(isChecked ? .white : Color.main) } .frame(height: 48.7) .frame(maxWidth: .infinity) - .background(isChecked ? Color(hex: "3BB9F1") : Color(hex: "13181B")) + .background(isChecked ? Color.button : Color.bg) .cornerRadius(6.7) .onTapGesture { hideKeyboard()