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 0000000..a8cfb1d Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/btn_square_select_checked.imageset/btn_square_select_checked.png differ diff --git a/SodaLive/Resources/Assets.xcassets/btn_square_select_normal.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/btn_square_select_normal.imageset/Contents.json new file mode 100644 index 0000000..05f900e --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/btn_square_select_normal.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "btn_square_select_normal.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/btn_square_select_normal.imageset/btn_square_select_normal.png b/SodaLive/Resources/Assets.xcassets/btn_square_select_normal.imageset/btn_square_select_normal.png new file mode 100644 index 0000000..4468534 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/btn_square_select_normal.imageset/btn_square_select_normal.png differ 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