diff --git a/SodaLive/Resources/Assets.xcassets/ic_comment_78909c.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_comment_78909c.imageset/Contents.json new file mode 100644 index 0000000..3d7c794 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_comment_78909c.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "ic_comment_78909c.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_comment_78909c.imageset/ic_comment_78909c.png b/SodaLive/Resources/Assets.xcassets/ic_comment_78909c.imageset/ic_comment_78909c.png new file mode 100644 index 0000000..9f74843 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_comment_78909c.imageset/ic_comment_78909c.png differ diff --git a/SodaLive/Resources/Assets.xcassets/ic_heart_78909c.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_heart_78909c.imageset/Contents.json new file mode 100644 index 0000000..0fdd3a8 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_heart_78909c.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "ic_heart_78909c.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_heart_78909c.imageset/ic_heart_78909c.png b/SodaLive/Resources/Assets.xcassets/ic_heart_78909c.imageset/ic_heart_78909c.png new file mode 100644 index 0000000..c94d255 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_heart_78909c.imageset/ic_heart_78909c.png differ diff --git a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityItemView.swift b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityItemView.swift index 1a2dc43..aaef21a 100644 --- a/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/CreatorCommunity/CreatorCommunityItemView.swift @@ -17,82 +17,73 @@ struct CreatorCommunityItemView: View { HStack(spacing: 11) { KFImage(URL(string: item.creatorProfileUrl)) .cancelOnDisappear(true) - .downsampling( - size: CGSize( - width: 40, - height: 40 - ) - ) .resizable() .frame(width: 40, height: 40) .clipShape(Circle()) - Text(item.creatorNickname) - .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(Color.grayee) + VStack(alignment: .leading, spacing: 0) { + Text(item.creatorNickname) + .font(.custom(Font.preBold.rawValue, size: 18)) + .foregroundColor(Color.white) + + Text(item.date) + .font(.custom(Font.preRegular.rawValue, size: 14)) + .foregroundColor(Color(hex: "78909C")) + } Spacer() - - Text(item.date) - .font(.custom(Font.light.rawValue, size: 13.3)) - .foregroundColor(Color.gray77) } HStack(spacing: 0) { Text(item.content) - .font(.custom(Font.medium.rawValue, size: 12)) - .foregroundColor(Color.graybb) + .font(.custom(Font.preRegular.rawValue, size: 18)) + .foregroundColor(Color(hex: "B0BEC5")) .fixedSize(horizontal: false, vertical: true) .lineLimit(3) + .truncationMode(.tail) Spacer() if let imageUrl = item.imageUrl { KFImage(URL(string: imageUrl)) .cancelOnDisappear(true) - .downsampling( - size: CGSize( - width: 53.3, - height: 53.3 - ) - ) .resizable() - .frame(width: 53.3, height: 53.3) - .cornerRadius(4.7) + .frame(width: 64, height: 64) + .cornerRadius(12) .blur(radius: item.existOrdered || item.price <= 0 ? 0 : 15) } else { Rectangle() .foregroundColor(Color.gray22.opacity(0)) - .frame(width: 53.3, height: 53.3) + .frame(width: 64, height: 64) } } HStack(spacing: 13.3) { - HStack(spacing: 6) { - Image("ic_heart_777") + HStack(spacing: 4) { + Image("ic_heart_78909c") .resizable() - .frame(width: 13.3, height: 13.3) + .frame(width: 24, height: 24) Text("\(item.likeCount)") - .font(.custom(Font.medium.rawValue, size: 11)) - .foregroundColor(Color.gray77) + .font(.custom(Font.preRegular.rawValue, size: 18)) + .foregroundColor(Color(hex: "78909C")) } - HStack(spacing: 6) { - Image("ic_message_square_777") + HStack(spacing: 4) { + Image("ic_comment_78909c") .resizable() - .frame(width: 13.3, height: 13.3) + .frame(width: 24, height: 24) Text("\(item.commentCount)") - .font(.custom(Font.medium.rawValue, size: 11)) - .foregroundColor(Color.gray77) + .font(.custom(Font.preRegular.rawValue, size: 18)) + .foregroundColor(Color(hex: "78909C")) } } } .frame(maxWidth: .infinity, alignment: .leading) - .padding(13.3) - .background(Color.gray22) - .cornerRadius(11) + .padding(16) + .background(Color(hex: "263238")) + .cornerRadius(16) } } diff --git a/SodaLive/Sources/Extensions/UserDefaultsExtension.swift b/SodaLive/Sources/Extensions/UserDefaultsExtension.swift index 05130cc..a23c0ec 100644 --- a/SodaLive/Sources/Extensions/UserDefaultsExtension.swift +++ b/SodaLive/Sources/Extensions/UserDefaultsExtension.swift @@ -21,7 +21,6 @@ enum UserDefaultsKey: String, CaseIterable { case noChatRoomList case devicePushToken case isContentPlayLoop - case isFollowedChannel case isViewedOnboardingView case notShowingEventPopupId case isAdultContentVisible diff --git a/SodaLive/Sources/Live/LiveViewModel.swift b/SodaLive/Sources/Live/LiveViewModel.swift index 4e970e3..b4aa1d0 100644 --- a/SodaLive/Sources/Live/LiveViewModel.swift +++ b/SodaLive/Sources/Live/LiveViewModel.swift @@ -39,12 +39,6 @@ final class LiveViewModel: ObservableObject { @Published var passwordDialogConfirmAction: (String) -> Void = { _ in } @Published var isShowPasswordDialog = false - @Published var isFollowingList = UserDefaults.bool(forKey: .isFollowedChannel) { - didSet { - UserDefaults.set(isFollowingList, forKey: .isFollowedChannel) - } - } - @Published var liveStartDate: String? = nil @Published var nowDate: String? = nil diff --git a/SodaLive/Sources/Live/SectionCommunityPostView.swift b/SodaLive/Sources/Live/SectionCommunityPostView.swift index d809a7c..8d36e40 100644 --- a/SodaLive/Sources/Live/SectionCommunityPostView.swift +++ b/SodaLive/Sources/Live/SectionCommunityPostView.swift @@ -12,17 +12,30 @@ struct SectionCommunityPostView: View { let items: [GetCommunityPostListResponse] var body: some View { - ScrollView(.horizontal, showsIndicators: false) { - HStack(spacing: 13.3) { - ForEach(0..