klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(creator): 채널 공통 셸을 분리한다

Browse Source
This commit is contained in:
Yu Sung
2026-07-02 15:50:38 +09:00
parent d87d761670
commit 949c8cec8e
7 changed files with 167 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SodaLive/Sources/ContentView.swift
View File

@@ -169,7 +169,7 @@ struct AppStepLayerView: View {
LiveReservationCompleteView(reservationCompleteData: response)
case .creatorDetail(let userId):
CreatorChannelHomeView(creatorId: userId)
CreatorChannelView(creatorId: userId)
case .followerList(let userId):
FollowerListView(userId: userId)

118
SodaLive/Sources/V2/CreatorChannel/CreatorChannelView.swift Normal file
View File

@@ -0,0 +1,118 @@
import SwiftUI
struct CreatorChannelView: View {
let creatorId: Int
@StateObject private var viewModel = CreatorChannelViewModel()
@Environment(\.dismiss) private var dismiss
var body: some View {
ZStack {
Color.black.ignoresSafeArea()
VStack(spacing: 0) {
titleBar
tabBar
selectedTabContent
}
if viewModel.isLoading {
LoadingView()
}
}
.navigationBarBackButtonHidden(true)
.onAppear {
if viewModel.hasLoaded == false {
viewModel.fetchHome(creatorId: creatorId)
}
}
.sodaToast(isPresented: $viewModel.isShowPopup, message: viewModel.errorMessage, autohideIn: 1)
}
private var titleBar: some View {
HStack(spacing: 12) {
Button {
dismiss()
} label: {
Image(systemName: "chevron.left")
.foregroundColor(.white)
.frame(width: 44, height: 44)
}
Spacer()
if let creator = viewModel.response?.creator {
Button {
if creator.isFollow {
viewModel.creatorFollow(follow: false, notify: false)
} else {
viewModel.creatorFollow(follow: true, notify: true)
}
} label: {
Text(creator.isFollow ? I18n.CreatorChannelHome.following : I18n.CreatorChannelHome.follow)
.font(.system(size: 13, weight: .semibold))
.foregroundColor(creator.isFollow ? .white : .black)
.padding(.horizontal, 12)
.frame(height: 30)
.background(creator.isFollow ? Color.gray33 : Color.soda400)
.clipShape(Capsule())
}
if creator.isFollow {
Button {
if creator.isNotify {
viewModel.creatorFollow(follow: true, notify: false)
} else {
viewModel.creatorFollow(follow: true, notify: true)
}
} label: {
Image(systemName: creator.isNotify ? "bell.fill" : "bell")
.foregroundColor(.white)
.frame(width: 44, height: 44)
}
}
}
}
.frame(height: 56)
.padding(.horizontal, 8)
.background(Color.black)
}
private var tabBar: some View {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 20) {
ForEach(CreatorChannelTab.allCases, id: \.self) { tab in
Button {
viewModel.selectedTab = tab
} label: {
VStack(spacing: 8) {
Text(tab.title)
.font(.system(size: 15, weight: viewModel.selectedTab == tab ? .semibold : .regular))
.foregroundColor(viewModel.selectedTab == tab ? .white : Color.gray500)
Rectangle()
.fill(viewModel.selectedTab == tab ? Color.soda400 : Color.clear)
.frame(height: 2)
}
}
}
}
.padding(.horizontal, 20)
}
.frame(height: 48)
.background(Color.black)
}
@ViewBuilder
private var selectedTabContent: some View {
if viewModel.selectedTab != .home || viewModel.isApiFailedPlaceholderVisible {
CreatorChannelPlaceholderTabView(title: viewModel.selectedTab.title)
} else if let response = viewModel.response {
CreatorChannelHomeView(response: response) { tab in
viewModel.selectedTab = tab
}
} else {
CreatorChannelPlaceholderTabView(title: CreatorChannelTab.home.title)
}
}
}

49
SodaLive/Sources/V2/CreatorChannel/Home/CreatorChannelHomeViewModel.swift → SodaLive/Sources/V2/CreatorChannel/CreatorChannelViewModel.swift
View File

@@ -1,7 +1,7 @@
import Foundation
import Combine
final class CreatorChannelHomeViewModel: ObservableObject {
final class CreatorChannelViewModel: ObservableObject {
private let repository = CreatorChannelHomeRepository()
private let userRepository = UserRepository()
private var subscription = Set<AnyCancellable>()
@@ -9,7 +9,7 @@ final class CreatorChannelHomeViewModel: ObservableObject {
@Published var isLoading = false
@Published var response: CreatorChannelHomeResponse?
@Published var hasLoaded = false
@Published var selectedTab: CreatorChannelHomeTab = .home
@Published var selectedTab: CreatorChannelTab = .home
@Published var isApiFailedPlaceholderVisible = false
@Published var errorMessage = ""
@Published var isShowPopup = false
@@ -57,10 +57,11 @@ final class CreatorChannelHomeViewModel: ObservableObject {
.store(in: &subscription)
}
func follow(creatorId: Int, notify: Bool = true) {
func creatorFollow(follow: Bool = true, notify: Bool = true) {
guard let creatorId = response?.creator.creatorId else { return }
isLoading = true
userRepository.creatorFollow(creatorId: creatorId, follow: true, notify: notify)
userRepository.creatorFollow(creatorId: creatorId, follow: follow, notify: notify)
.sink { [weak self] result in
guard let self else { return }
@@ -79,45 +80,7 @@ final class CreatorChannelHomeViewModel: ObservableObject {
let decoded = try jsonDecoder.decode(ApiResponseWithoutData.self, from: response.data)
if decoded.success {
self.updateCreatorFollowState(isFollow: true, isNotify: notify)
} else {
self.errorMessage = decoded.message ?? I18n.Common.commonError
self.isShowPopup = true
}
} catch {
ERROR_LOG(error.localizedDescription)
self.errorMessage = I18n.Common.commonError
self.isShowPopup = true
}
self.isLoading = false
}
.store(in: &subscription)
}
func unfollow(creatorId: Int) {
isLoading = true
userRepository.creatorUnFollow(creatorId: creatorId)
.sink { [weak self] result in
guard let self else { return }
switch result {
case .finished:
DEBUG_LOG("finish")
case .failure(let error):
ERROR_LOG(error.localizedDescription)
self.isLoading = false
}
} receiveValue: { [weak self] response in
guard let self else { return }
do {
let jsonDecoder = JSONDecoder()
let decoded = try jsonDecoder.decode(ApiResponseWithoutData.self, from: response.data)
if decoded.success {
self.updateCreatorFollowState(isFollow: false, isNotify: false)
self.updateCreatorFollowState(isFollow: follow, isNotify: notify)
} else {
self.errorMessage = decoded.message ?? I18n.Common.commonError
self.isShowPopup = true

111
SodaLive/Sources/V2/CreatorChannel/Home/CreatorChannelHomeView.swift
View File

@@ -1,114 +1,19 @@
import SwiftUI
struct CreatorChannelHomeView: View {
let creatorId: Int
@StateObject private var viewModel = CreatorChannelHomeViewModel()
@Environment(\.dismiss) private var dismiss
let response: CreatorChannelHomeResponse
let onSelectTab: (CreatorChannelTab) -> Void
var body: some View {
ZStack {
Color.black.ignoresSafeArea()
VStack(spacing: 0) {
titleBar
tabBar
if viewModel.selectedTab != .home || viewModel.isApiFailedPlaceholderVisible {
CreatorChannelPlaceholderTabView(title: viewModel.selectedTab.title)
} else {
homeContent
}
}
if viewModel.isLoading {
LoadingView()
}
}
.navigationBarBackButtonHidden(true)
.onAppear {
if viewModel.hasLoaded == false {
viewModel.fetchHome(creatorId: creatorId)
}
}
.sodaToast(isPresented: $viewModel.isShowPopup, message: viewModel.errorMessage, autohideIn: 1)
}
private var titleBar: some View {
HStack(spacing: 12) {
Button {
dismiss()
} label: {
Image(systemName: "chevron.left")
.foregroundColor(.white)
.frame(width: 44, height: 44)
}
Spacer()
if let creator = viewModel.response?.creator {
Button {
if creator.isFollow {
viewModel.unfollow(creatorId: creator.creatorId)
} else {
viewModel.follow(creatorId: creator.creatorId, notify: true)
}
} label: {
Text(creator.isFollow ? I18n.CreatorChannelHome.following : I18n.CreatorChannelHome.follow)
.font(.system(size: 13, weight: .semibold))
.foregroundColor(creator.isFollow ? .white : .black)
.padding(.horizontal, 12)
.frame(height: 30)
.background(creator.isFollow ? Color.gray33 : Color.soda400)
.clipShape(Capsule())
}
}
}
.frame(height: 56)
.padding(.horizontal, 8)
.background(Color.black)
}
private var tabBar: some View {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 20) {
ForEach(CreatorChannelHomeTab.allCases, id: \.self) { tab in
Button {
viewModel.selectedTab = tab
} label: {
VStack(spacing: 8) {
Text(tab.title)
.font(.system(size: 15, weight: viewModel.selectedTab == tab ? .semibold : .regular))
.foregroundColor(viewModel.selectedTab == tab ? .white : Color.gray500)
Rectangle()
.fill(viewModel.selectedTab == tab ? Color.soda400 : Color.clear)
.frame(height: 2)
}
}
}
}
.padding(.horizontal, 20)
}
.frame(height: 48)
.background(Color.black)
}
private var homeContent: some View {
ScrollView {
VStack(alignment: .leading, spacing: 16) {
if let creator = viewModel.response?.creator {
Text(creator.nickname)
.font(.system(size: 24, weight: .bold))
.foregroundColor(.white)
Text(response.creator.nickname)
.font(.system(size: 24, weight: .bold))
.foregroundColor(.white)
Text(I18n.CreatorChannelHome.followerCount(creator.followerCount.comma()))
.font(.system(size: 14))
.foregroundColor(Color.gray500)
} else {
CreatorChannelPlaceholderTabView(title: CreatorChannelHomeTab.home.title)
.frame(minHeight: 240)
}
Text(I18n.CreatorChannelHome.followerCount(response.creator.followerCount.comma()))
.font(.system(size: 14))
.foregroundColor(Color.gray500)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(20)

2
SodaLive/Sources/V2/CreatorChannel/Home/Models/CreatorChannelHomeTab.swift → SodaLive/Sources/V2/CreatorChannel/Models/CreatorChannelTab.swift
View File

@@ -1,6 +1,6 @@
import Foundation
enum CreatorChannelHomeTab: CaseIterable, Hashable {
enum CreatorChannelTab: CaseIterable, Hashable {
case home
case live
case audio