From 24f09d068d306442716bf4a97184e52b8906bd27 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Fri, 30 Aug 2024 17:47:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=8C=93?= =?UTF-8?q?=EA=B8=80=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=8C=93=EA=B8=80=EC=9D=80=20=EB=8B=89=EB=84=A4?= =?UTF-8?q?=EC=9E=84=20=EC=98=86=EC=97=90=20'=EB=B9=84=EB=B0=80=EB=8C=93?= =?UTF-8?q?=EA=B8=80'=20=EB=A7=88=ED=81=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents.json | 21 ++++++++++++++++++ .../btn_square_select_checked.png | Bin 0 -> 888 bytes .../Contents.json | 21 ++++++++++++++++++ .../btn_square_select_normal.png | Bin 0 -> 835 bytes .../Comment/AudioContentCommentItemView.swift | 20 +++++++++++++---- .../Comment/AudioContentCommentListView.swift | 4 ++-- .../GetAudioContentCommentListResponse.swift | 1 + 7 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 SodaLive/Resources/Assets.xcassets/btn_square_select_checked.imageset/Contents.json create mode 100644 SodaLive/Resources/Assets.xcassets/btn_square_select_checked.imageset/btn_square_select_checked.png create mode 100644 SodaLive/Resources/Assets.xcassets/btn_square_select_normal.imageset/Contents.json create mode 100644 SodaLive/Resources/Assets.xcassets/btn_square_select_normal.imageset/btn_square_select_normal.png diff --git a/SodaLive/Resources/Assets.xcassets/btn_square_select_checked.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/btn_square_select_checked.imageset/Contents.json new file mode 100644 index 0000000..b191e8f --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/btn_square_select_checked.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "btn_square_select_checked.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/btn_square_select_checked.imageset/btn_square_select_checked.png b/SodaLive/Resources/Assets.xcassets/btn_square_select_checked.imageset/btn_square_select_checked.png new file mode 100644 index 0000000000000000000000000000000000000000..a8cfb1d15799d740bc8b0f925f8c85d8217b29b2 GIT binary patch literal 888 zcmV-;1Bd*HP)O;}CyYbM!bGrJEg>}JAdp8aO#o7pf7CESX{Ck)1Cz%b2# zVRR=^Fc!_{^Na5%L$TrlW}QsDjGxU8_#Ol1L+Au&PXfvO;^y7Z5nW2*f-HY6PRF1p z(Ll-wlQgHRLS(g-CC0LY(h=->BtGop{3~1lGmJ17vI}qt2Ez)dxs z8Rl>qp0MtC!n)%L>y9U^JD#xa_|XLf{S0@`2M`P}MD|bc{n&&mju#&4<5(K+$4Jm8 zuV*jyV1Da2J|_&Q;OHhzvdh;7{>l=ABHARaierT>*`faODkic}#*xCcWRp1)tKTwE z#c{&*WamWxJxr?)T8DowJFuJ%_fvrCpx65cq-isqXy`<$eo-x!oKwV=LVO?Fq@_ue~u zWC^thi+ni0m8vLBkW4k{`oKNktSI>DzOu{UzTWU;?an7 zEm`U!G|Jm8OR$@-el`6og#qjIs-~DXKeD)eu5uG6*`*I@w2PKZE$cNtg2MO9soIj?r#fx_J0sX_BR*6SRD_WJ&M*%vCJ!q%2{}@=!`|r?9bq`qf0I zWeHoChf5#RBERP3`j#S2xwg~Tz8;PoH1Pt;2E2bBbjK6c9Zy(yJYn7Ogms6D*Bvpq z1%@bxX{^I77(!TtcnvNgZyJmI?PO?^nZ{FS4mr{uCOK&Nd$9o8+@vp2e_A>gM(NFP z=qS)*gmsKGIazy_Cor5Ks-O%M%5yWnJv%*1Eu2Bd8qiIO!{7Sx0zS^Uhpynj$G2zYDrzv72g zp-6N(ou*}3Q~JLRYFK>oJDj#3+qNIo zkj-n!eFuh1J%7K#Q^0vS*kY2zk*>D|*65wp%$z;-F z>02cm!@y^yvyuf`tuzk;S`pHTv)Onotw#7EJyoyGS{7&v<0e_U5h2}T z!JF_P53(SZfk!A!Ps^+_ke-U_ow+QCZKNe`I!fA$ShfVI%Ys;kmSVIOCG9H5naG0J z$I>UHLo$;EiA)|&NM|Yw5}PeSdb{0zp?}i%S<8Y%qn11xLs#_yU6O9JF)mV>59dV| zlq(OWQwp0-DQr5Wu<4Y-FO51D6$l4%22a+Fc{5%t7RdMzR$mvsF`<;R5 z_4*ITao+RcCo+pU%eD_b)RIATf=j!{$xHQnhyoGNQ)7I`)%adM@fT6TZRx(^`^5kN N002ovPDHLkV1mS8cdP&a literal 0 HcmV?d00001 diff --git a/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentItemView.swift b/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentItemView.swift index c8d1b99..5285145 100644 --- a/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentItemView.swift +++ b/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentItemView.swift @@ -32,13 +32,25 @@ struct AudioContentCommentItemView: View { .clipShape(Circle()) VStack(alignment: .leading, spacing: 0) { - Text(commentItem.nickname) - .font(.custom(Font.medium.rawValue, size: 12)) - .foregroundColor(Color.gray90) + HStack(spacing: 6.7) { + Text(commentItem.nickname) + .font(.custom(Font.medium.rawValue, size: 12)) + .foregroundColor(Color.gray90) + + if commentItem.isSecret { + Text("비밀댓글") + .font(.custom(Font.medium.rawValue, size: 11)) + .foregroundColor(Color.grayee) + .padding(.horizontal, 4) + .padding(.vertical, 2) + .background(Color.button.opacity(0.2)) + .cornerRadius(3.3) + } + } Text(commentItem.date) .font(.custom(Font.medium.rawValue, size: 10.3)) - .foregroundColor(Color(hex: "525252")) + .foregroundColor(Color.gray52) .padding(.top, 4) } diff --git a/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentListView.swift b/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentListView.swift index 09798d3..c0c1dcb 100644 --- a/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentListView.swift +++ b/SodaLive/Sources/Content/Detail/Comment/AudioContentCommentListView.swift @@ -55,7 +55,7 @@ struct AudioContentCommentListView: View { HStack(spacing: 8) { Spacer() - Image(viewModel.isSecret ? "btn_select_checked" : "btn_select_normal") + Image(viewModel.isSecret ? "btn_square_select_checked" : "btn_square_select_normal") .resizable() .frame(width: 20, height: 20) .onTapGesture { @@ -64,7 +64,7 @@ struct AudioContentCommentListView: View { Text("비밀댓글") .font(.custom(Font.medium.rawValue, size: 12)) - .foregroundColor(Color.grayee) + .foregroundColor(viewModel.isSecret ? Color.button : Color.grayee) .onTapGesture { viewModel.isSecret.toggle() } diff --git a/SodaLive/Sources/Content/Detail/Comment/GetAudioContentCommentListResponse.swift b/SodaLive/Sources/Content/Detail/Comment/GetAudioContentCommentListResponse.swift index 2947407..e2afdd4 100644 --- a/SodaLive/Sources/Content/Detail/Comment/GetAudioContentCommentListResponse.swift +++ b/SodaLive/Sources/Content/Detail/Comment/GetAudioContentCommentListResponse.swift @@ -18,6 +18,7 @@ struct GetAudioContentCommentListItem: Decodable { let nickname: String let profileUrl: String let comment: String + let isSecret: Bool let donationCan: Int let date: String let replyCount: Int