From 1f35c4585dd85f4fb00e3f77ffe53f23d53911aa Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Fri, 15 Mar 2024 14:30:39 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EA=B8=88=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20=EC=A4=91=20-=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=9C=A0/=EB=AC=B4=EB=A3=8C=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?-=20=EB=AC=B4=EB=A3=8C=20=EB=B0=B0=EA=B2=BD=EC=83=89=20:=20#111?= =?UTF-8?q?111=20-=20=EC=9C=A0=EB=A3=8C=20=EB=B0=B0=EA=B2=BD=EC=83=89=20:?= =?UTF-8?q?=20#DD4500=20-=20=EC=9C=A0=EB=A3=8C=20=ED=91=9C=EC=8B=9C=20-=20?= =?UTF-8?q?white=20=EC=BA=94=EA=B3=BC=20=ED=95=A8=EA=BB=98=20100=20?= =?UTF-8?q?=EA=B3=BC=20=EA=B0=99=EC=9D=B4=20=EA=B0=80=EA=B2=A9=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_can_white.imageset/Contents.json | 21 ++++++++++++ .../ic_can_white.imageset/ic_can_white.png | Bin 0 -> 563 bytes .../Sources/Live/Now/LiveNowItemView.swift | 31 +++++++++++------- SodaLive/Sources/UI/Theme/Color.swift | 1 + 4 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 SodaLive/Resources/Assets.xcassets/ic_can_white.imageset/Contents.json create mode 100644 SodaLive/Resources/Assets.xcassets/ic_can_white.imageset/ic_can_white.png diff --git a/SodaLive/Resources/Assets.xcassets/ic_can_white.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_can_white.imageset/Contents.json new file mode 100644 index 0000000..74674a7 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_can_white.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_can_white.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_can_white.imageset/ic_can_white.png b/SodaLive/Resources/Assets.xcassets/ic_can_white.imageset/ic_can_white.png new file mode 100644 index 0000000000000000000000000000000000000000..f3157c47455a2dbfca2aaa5f3953ae09bfec0a80 GIT binary patch literal 563 zcmV-30?hr1P)@A9-9AiPj4Ov>0d}2%};DZfJc9Q2yjD@rMrSse?AZl|) zgF#p_%85CY0t);AB;Z%PNz2>=8E@a7>U5izRg$W+PwE$V&JATTliXV6QAb_d*`rfpKK40BB<)$V|sU`BGH9-McH z6EzjPfdZ8PT1kSkpEEBMaAh-H1aWX9?|J1PP@p{mW`nX1u2 zWLeMD4b6Ro60cS)<;V5@glb-7^4Z)cIOB5!RzyaFy4Cj4wF851LmFRA0umV)2*;x4 zyPdJ`gl*UI6T%(=!<})a74Yx>3%K45!jj?~`3A|s4B%Vc2W|iW002ovPDHLkV1n32 B@Q45a literal 0 HcmV?d00001 diff --git a/SodaLive/Sources/Live/Now/LiveNowItemView.swift b/SodaLive/Sources/Live/Now/LiveNowItemView.swift index 832c8ca..1f12eae 100644 --- a/SodaLive/Sources/Live/Now/LiveNowItemView.swift +++ b/SodaLive/Sources/Live/Now/LiveNowItemView.swift @@ -12,8 +12,8 @@ struct LiveNowItemView: View { let item: GetRoomListResponse - let width: CGFloat = 133.3 - let height: CGFloat = 176.7 + let width: CGFloat = 128 + let height: CGFloat = 179 var body: some View { VStack(alignment: .leading, spacing: 8) { @@ -32,14 +32,20 @@ struct LiveNowItemView: View { ) VStack(alignment: .trailing, spacing: 0) { - HStack(spacing: 3.3) { - Text(item.price > 0 ? "유료" : "무료") - .font(.custom(Font.medium.rawValue, size: 12)) - .foregroundColor(Color.white) - .padding(.horizontal, 7.3) - .padding(.vertical, 4) - .background(Color(hex: item.price > 0 ? "881609" : "643bc8")) - .cornerRadius(10) + HStack(spacing: 0) { + HStack(spacing: 1) { + if item.price > 0 { + Image("ic_can_white") + } + + Text(item.price > 0 ? "\(item.price)" : "무료") + .font(.custom(Font.medium.rawValue, size: 12)) + .foregroundColor(Color.white) + } + .padding(.horizontal, 7.3) + .padding(.vertical, 4) + .background(item.price > 0 ? Color.mainRed3 : Color.gray11) + .cornerRadius(13.3) Spacer() @@ -47,6 +53,9 @@ struct LiveNowItemView: View { Image("ic_lock") .resizable() .frame(width: 20, height: 20) + .padding(2.7) + .background(Color.gray33.opacity(0.7)) + .clipShape(Circle()) } } .padding(.horizontal, 3.3) @@ -97,7 +106,7 @@ struct LiveNowItemView_Previews: PreviewProvider { numberOfPeople: 5, coverImageUrl: "https://test-cf.sodalive.net/profile/default-profile.png", isAdult: true, - price: 0, + price: 20, tags: ["팬미팅", "힐링"], channelName: nil, creatorProfileImage: "https://test-cf.sodalive.net/profile/default-profile.png", diff --git a/SodaLive/Sources/UI/Theme/Color.swift b/SodaLive/Sources/UI/Theme/Color.swift index d97fa7d..544007c 100644 --- a/SodaLive/Sources/UI/Theme/Color.swift +++ b/SodaLive/Sources/UI/Theme/Color.swift @@ -28,5 +28,6 @@ extension Color { static let mainRed = Color(hex: "ff5c49") static let mainRed2 = Color(hex: "ea3a25") + static let mainRed3 = Color(hex: "dd4500") static let mainYellow = Color(hex: "ffdc00") }