diff --git a/SodaLive/Sources/Live/LiveView.swift b/SodaLive/Sources/Live/LiveView.swift index 9e8eda9..4a6b749 100644 --- a/SodaLive/Sources/Live/LiveView.swift +++ b/SodaLive/Sources/Live/LiveView.swift @@ -73,13 +73,8 @@ struct LiveView: View { } ) - if viewModel.recommendChannelItems.count > 0 { - SectionRecommendChannelView( - items: viewModel.isFollowingList ? - viewModel.followedChannelItems : - viewModel.recommendChannelItems, - isFollowingList: $viewModel.isFollowingList - ) + if viewModel.followedChannelItems.count > 0 { + SectionRecommendChannelView(items: viewModel.followedChannelItems) } if viewModel.communityPostItems.count > 0 { diff --git a/SodaLive/Sources/Live/LiveViewModel.swift b/SodaLive/Sources/Live/LiveViewModel.swift index 40a822f..4e970e3 100644 --- a/SodaLive/Sources/Live/LiveViewModel.swift +++ b/SodaLive/Sources/Live/LiveViewModel.swift @@ -18,7 +18,6 @@ final class LiveViewModel: ObservableObject { @Published private(set) var liveNowItems = [GetRoomListResponse]() @Published private(set) var liveReservationItems = [GetRoomListResponse]() @Published private(set) var recommendLiveItems: [GetRecommendLiveResponse] = [] - @Published private(set) var recommendChannelItems: [GetRecommendChannelResponse] = [] @Published private(set) var followedChannelItems: [GetRecommendChannelResponse] = [] @Published private(set) var communityPostItems: [GetCommunityPostListResponse] = [] @Published private(set) var replayLiveItems: [AudioContentMainItem] = [] diff --git a/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift b/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift index 5cb3642..edb6658 100644 --- a/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift +++ b/SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift @@ -12,46 +12,26 @@ struct SectionRecommendChannelView: View { let items: [GetRecommendChannelResponse] - @Binding var isFollowingList: Bool @AppStorage("token") private var token: String = UserDefaults.string(forKey: UserDefaultsKey.token) var body: some View { - VStack(spacing: 21.3) { + VStack(spacing: 16) { HStack(spacing: 0) { - if isFollowingList { - Text("팔로잉 ") - .font(.custom(Font.bold.rawValue, size: 18.3)) - .foregroundColor(.grayee) - } else { - Text("추천 ") - .font(.custom(Font.bold.rawValue, size: 18.3)) - .foregroundColor(.grayee) - } - - Text("채널") - .font(.custom(Font.bold.rawValue, size: 18.3)) + Text("팔로잉 ") + .font(.custom(Font.preBold.rawValue, size: 24)) .foregroundColor(.button) - Spacer() + Text("채널") + .font(.custom(Font.preBold.rawValue, size: 24)) + .foregroundColor(.white) - if !token.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { - Text("팔로잉 채널") - .font(.custom(Font.medium.rawValue, size: 13.3)) - .foregroundColor(.gray77) - - Image(isFollowingList ? "btn_toggle_on_big" : "btn_toggle_off_big") - .resizable() - .frame(width: 33.3, height: 20) - .padding(.leading, 6.7) - .onTapGesture { - isFollowingList.toggle() - } - } + Spacer() } - .frame(width: screenSize().width - 26.7, alignment: .leading) + .frame(maxWidth: .infinity, alignment: .leading) + .padding(.horizontal, 24) ScrollView(.horizontal, showsIndicators: false) { - HStack(spacing: 21.3) { + HStack(spacing: 16) { ForEach(0..