From 3ab5735fde20a9229ac5b459cf4939b3ed17f8a1 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Mon, 21 Aug 2023 04:08:12 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20-=20=EC=A0=9C=EB=AA=A9=20=EC=99=BC=EC=AA=BD?= =?UTF-8?q?=EC=97=90=2019=EA=B8=88=20=ED=91=9C=EC=8B=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Room/Detail/GetRoomDetailResponse.swift | 1 + .../Live/Room/Detail/LiveDetailView.swift | 22 ++++++++++++++----- SodaLive/Sources/Live/Room/LiveRoomView.swift | 11 +++++----- .../MyPage/Can/Payment/CanPaymentView.swift | 2 +- .../MyPage/Can/Payment/CanPgPaymentView.swift | 2 +- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/SodaLive/Sources/Live/Room/Detail/GetRoomDetailResponse.swift b/SodaLive/Sources/Live/Room/Detail/GetRoomDetailResponse.swift index eb9bc5c..72ec5c1 100644 --- a/SodaLive/Sources/Live/Room/Detail/GetRoomDetailResponse.swift +++ b/SodaLive/Sources/Live/Room/Detail/GetRoomDetailResponse.swift @@ -13,6 +13,7 @@ struct GetRoomDetailResponse: Decodable { let title: String let notice: String let isPaid: Bool + let isAdult: Bool let isPrivateRoom: Bool let password: String? let tags: [String] diff --git a/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift b/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift index f61e267..ed66b82 100644 --- a/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift +++ b/SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift @@ -75,11 +75,23 @@ struct LiveDetailView: View { if let room = viewModel.room { ScrollView(.vertical, showsIndicators: false) { VStack(spacing: 0) { - Text(room.title) - .font(.custom(Font.bold.rawValue, size: 18.3)) - .foregroundColor(Color(hex: "eeeeee")) - .frame(width: proxy.size.width - 26.7, alignment: .leading) - .padding(.top, 6.7) + HStack(spacing: 5.3) { + if room.isAdult { + Text("19") + .font(.custom(Font.medium.rawValue, size: 12)) + .foregroundColor(Color(hex: "e33621")) + .padding(.horizontal, 5.3) + .padding(.vertical, 3.3) + .background(Color(hex: "601d14")) + .cornerRadius(2.6) + } + + Text(room.title) + .font(.custom(Font.bold.rawValue, size: 18.3)) + .foregroundColor(Color(hex: "eeeeee")) + } + .frame(width: proxy.size.width - 26.7, alignment: .leading) + .padding(.top, 6.7) HStack(spacing: 0) { Text(room.beginDateTime) diff --git a/SodaLive/Sources/Live/Room/LiveRoomView.swift b/SodaLive/Sources/Live/Room/LiveRoomView.swift index 2bb1c79..d10fbf2 100644 --- a/SodaLive/Sources/Live/Room/LiveRoomView.swift +++ b/SodaLive/Sources/Live/Room/LiveRoomView.swift @@ -110,11 +110,12 @@ struct LiveRoomView: View { HStack(spacing: 5.3) { if liveRoomInfo.isAdult { Text("19") - .font(.custom(Font.bold.rawValue, size: 11.3)) - .foregroundColor(Color.white) - .padding(4) - .background(Color(hex: "e53621")) - .clipShape(Circle()) + .font(.custom(Font.medium.rawValue, size: 12)) + .foregroundColor(Color(hex: "e33621")) + .padding(.horizontal, 5.3) + .padding(.vertical, 3.3) + .background(Color(hex: "601d14")) + .cornerRadius(2.6) } Text(liveRoomInfo.title) diff --git a/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift b/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift index 169ccf2..4e1854c 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift @@ -116,7 +116,7 @@ struct CanPaymentView: View { .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "777777")) - Text("자세한 내용은 요즘라이브 이용약관에서 확인할 수 있습니다.") + Text("자세한 내용은 소다라이브 이용약관에서 확인할 수 있습니다.") .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "777777")) .fixedSize(horizontal: false, vertical: true) diff --git a/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift b/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift index 11c793c..384880d 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift @@ -205,7 +205,7 @@ struct CanPgPaymentView: View { .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "777777")) - Text("자세한 내용은 요즘라이브 이용약관에서 확인할 수 있습니다.") + Text("자세한 내용은 소다라이브 이용약관에서 확인할 수 있습니다.") .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "777777")) .fixedSize(horizontal: false, vertical: true)