크리에이터만 라이브를 개설할 수 있도록 변경

SodaLive/Sources/App/AppDelegate.swift

@@ -94,7 +94,7 @@ extension AppDelegate : UNUserNotificationCenterDelegate {
         // With swizzling disabled you must let Messaging know about the message, for Analytics
         Messaging.messaging().appDidReceiveMessage(userInfo)
         
-        let roomIdString = userInfo["suda_room_id"] as? String
+        let roomIdString = userInfo["room_id"] as? String
         let audioContentIdString = userInfo["audio_content_id"] as? String
         
         if let roomIdString = roomIdString, let roomId = Int(roomIdString), roomId > 0 {

SodaLive/Sources/App/AppStep.swift

@@ -58,6 +58,8 @@ enum AppStep {
     
     case modifyContent(contentId: Int)
     
+    case contentListAll(userId: Int)
+    
     case contentDetail(contentId: Int)
     
     case liveReservationComplete(response: MakeLiveReservationResponse)
@@ -101,4 +103,6 @@ enum AppStep {
     case changeNickname
     
     case profileUpdate(refresh: () -> Void)
+    
+    case followingList
 }

SodaLive/Sources/Common/LoadingView.swift

@@ -8,57 +8,18 @@
 import SwiftUI
 
 struct LoadingView: View {
-    @State var index = 0
-    
-    @State var timer = Timer.publish(every: 0.35, on: .current, in: .common).autoconnect()
-    
     var body: some View {
         ZStack {
             Color.primary.opacity(0.2)
                 .ignoresSafeArea()
             
             ZStack {
-                Image("loading_1")
+                ActivityIndicatorView()
-                    .resizable()
                     .frame(width: 100, height: 100)
-                    .opacity(index == 0 ? 1.0 : 0.0)
-                
-                Image("loading_2")
-                    .resizable()
-                    .frame(width: 100, height: 100)
-                    .opacity(index == 1 ? 1.0 : 0.0)
-                
-                Image("loading_3")
-                    .resizable()
-                    .frame(width: 100, height: 100)
-                    .opacity(index == 2 ? 1.0 : 0.0)
-                
-                Image("loading_4")
-                    .resizable()
-                    .frame(width: 100, height: 100)
-                    .opacity(index == 3 ? 1.0 : 0.0)
-                
-                Image("loading_5")
-                    .resizable()
-                    .frame(width: 100, height: 100)
-                    .opacity(index == 4 ? 1.0 : 0.0)
             }
             .frame(width: 150, height: 150)
-            .background(Color.white)
-            .cornerRadius(14)
-            .shadow(color: Color.primary.opacity(0.07), radius: 5, x: 5, y: 5)
-            .shadow(color: Color.primary.opacity(0.07), radius: 5, x: -5, y: -5)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
-        .onReceive(timer) { _ in
-            DispatchQueue.main.async {
-                if index == 4 {
-                    index = 0
-                } else {
-                    index += 1
-                }
-            }
-        }
     }
 }
 
@@ -67,3 +28,16 @@ struct LoadingView_Previews: PreviewProvider {
         LoadingView()
     }
 }
+
+struct ActivityIndicatorView: UIViewRepresentable {
+    func makeUIView(context: Context) -> some UIActivityIndicatorView {
+        let activityIndicator = UIActivityIndicatorView(style: .large)
+        activityIndicator.color = UIColor(hex: "80D8FF")
+        return activityIndicator
+    }
+    
+    func updateUIView(_ uiView: UIViewType, context: Context) {
+        uiView.startAnimating()
+    }
+}
+

SodaLive/Sources/Content/ContentListItemView.swift

@@ -22,17 +22,6 @@ struct ContentListItemView: View {
                         .frame(width: 66.7, height: 66.7, alignment: .top)
                         .clipped()
                         .cornerRadius(5.3)
-                    
-                    if item.isAdult {
-                        Text("19")
-                            .font(.custom(Font.bold.rawValue, size: 11.3))
-                            .foregroundColor(Color.white)
-                            .padding(4)
-                            .background(Color(hex: "e53621"))
-                            .clipShape(Circle())
-                            .padding(.top, 4.3)
-                            .padding(.leading, 4.3)
-                    }
                 }
                 
                 VStack(alignment: .leading, spacing: 0) {

SodaLive/Sources/Content/ContentListView.swift

@@ -0,0 +1,177 @@
+//
+//  ContentListView.swift
+//  SodaLive
+//
+//  Created by klaus on 2023/08/20.
+//
+
+import SwiftUI
+
+struct ContentListView: View {
+    
+    let userId: Int
+    @StateObject var viewModel = ContentListViewModel()
+    
+    var body: some View {
+        BaseView(isLoading: $viewModel.isLoading) {
+            VStack(spacing: 0) {
+                HStack(spacing: 0) {
+                    Button {
+                        AppState.shared.back()
+                    } label: {
+                        Image("ic_back")
+                            .resizable()
+                            .frame(width: 20, height: 20)
+                        
+                        Text("콘텐츠 전체보기")
+                            .font(.custom(Font.bold.rawValue, size: 18.3))
+                            .foregroundColor(Color(hex: "eeeeee"))
+                    }
+                    
+                    Spacer()
+                }
+                .padding(.horizontal, 13.3)
+                .frame(height: 50)
+                .background(Color.black)
+                
+                if userId == UserDefaults.int(forKey: .userId) {
+                    Text("새로운 콘텐츠 등록하기")
+                        .font(.custom(Font.bold.rawValue, size: 15))
+                        .foregroundColor(Color(hex: "eeeeee"))
+                        .padding(.vertical, 17)
+                        .frame(maxWidth: .infinity)
+                        .background(Color(hex: "9970ff"))
+                        .cornerRadius(5.3)
+                        .padding(.top, 13.3)
+                        .padding(.horizontal, 13.3)
+                        .onTapGesture { AppState.shared.setAppStep(step: .createContent) }
+                }
+                
+                HStack(spacing: 13.3) {
+                    Spacer()
+                    
+                    Text("최신순")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(
+                            Color(hex: "e2e2e2")
+                                .opacity(viewModel.sort == .NEWEST ? 1 : 0.5)
+                        )
+                        .onTapGesture {
+                            if viewModel.sort != .NEWEST {
+                                viewModel.sort = .NEWEST
+                            }
+                        }
+                    
+                    Text("높은 가격순")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(
+                            Color(hex: "e2e2e2")
+                                .opacity(viewModel.sort == .PRICE_HIGH ? 1 : 0.5)
+                        )
+                        .onTapGesture {
+                            if viewModel.sort != .PRICE_HIGH {
+                                viewModel.sort = .PRICE_HIGH
+                            }
+                        }
+                    
+                    Text("낮은 가격순")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(
+                            Color(hex: "e2e2e2")
+                                .opacity(viewModel.sort == .PRICE_LOW ? 1 : 0.5)
+                        )
+                        .onTapGesture {
+                            if viewModel.sort != .PRICE_LOW {
+                                viewModel.sort = .PRICE_LOW
+                            }
+                        }
+                }
+                .padding(.vertical, 13.3)
+                .padding(.horizontal, 20)
+                .background(Color(hex: "161616"))
+                .padding(.top, 13.3)
+                
+                HStack(spacing: 0) {
+                    Text("전체")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(Color(hex: "e2e2e2"))
+                    
+                    Text("\(viewModel.totalCount)")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(Color(hex: "ff5c49"))
+                        .padding(.leading, 8)
+                    
+                    Text("개")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(Color(hex: "e2e2e2"))
+                        .padding(.leading, 2)
+                    
+                    Spacer()
+                }
+                .padding(.vertical, 13.3)
+                .padding(.horizontal, 20)
+                
+                ScrollViewReader { reader in
+                    ScrollView(.vertical, showsIndicators: false) {
+                        LazyVStack(spacing: 10.7) {
+                            ScrollerToTop(reader: reader, scrollOnChange: $viewModel.scrollToTop)
+                            
+                            ForEach(0..<viewModel.audioContentList.count, id: \.self) { index in
+                                let audioContent = viewModel.audioContentList[index]
+                                ContentListItemView(item: audioContent)
+                                    .contentShape(Rectangle())
+                                    .onTapGesture {
+                                        AppState
+                                            .shared
+                                            .setAppStep(
+                                                step: .contentDetail(contentId: audioContent.contentId)
+                                            )
+                                    }
+                                    .onAppear {
+                                        if index == viewModel.audioContentList.count - 1 {
+                                            viewModel.getAudioContentList()
+                                        }
+                                    }
+                            }
+                        }
+                    }
+                }
+                .padding(.top, 13.3)
+            }
+            .onAppear {
+                viewModel.userId = userId
+                viewModel.getAudioContentList()
+            }
+            .popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .bottom, autohideIn: 2) {
+                HStack {
+                    Spacer()
+                    Text(viewModel.errorMessage)
+                        .padding(.vertical, 13.3)
+                        .frame(width: screenSize().width - 66.7, alignment: .center)
+                        .font(.custom(Font.medium.rawValue, size: 12))
+                        .background(Color(hex: "9970ff"))
+                        .foregroundColor(Color.white)
+                        .multilineTextAlignment(.leading)
+                        .cornerRadius(20)
+                        .padding(.bottom, 66.7)
+                    Spacer()
+                }
+            }
+        }
+    }
+}
+
+struct ScrollerToTop: View {
+    let reader: ScrollViewProxy
+    @Binding var scrollOnChange: Bool
+    
+    var body: some View {
+        EmptyView()
+            .id("topScrollPoint")
+            .onChange(of: scrollOnChange) { _ in
+                withAnimation {
+                    reader.scrollTo("topScrollPoint", anchor: .bottom)
+                }
+            }
+    }
+}

SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift

@@ -35,17 +35,6 @@ struct ContentOrderConfirmDialogView: View {
                             .frame(width: 88.7, height: 88.7, alignment: .center)
                             .clipped()
                             .cornerRadius(4)
-                        
-                        if audioContent.isAdult {
-                            Text("19")
-                                .font(.custom(Font.bold.rawValue, size: 11.3))
-                                .foregroundColor(Color.white)
-                                .padding(4)
-                                .background(Color(hex: "e53621"))
-                                .clipShape(Circle())
-                                .padding(.leading, 4.3)
-                                .padding(.top, 4.3)
-                        }
                     }
                     
                     VStack(alignment: .leading, spacing: 0) {

SodaLive/Sources/Content/Main/ContentMainCurationItemView.swift

@@ -24,8 +24,8 @@ struct ContentMainCurationItemView: View {
             
             ScrollView(.horizontal, showsIndicators: false) {
                 LazyHStack(alignment: .top, spacing: 13.3) {
-                    ForEach(0..<item.audioContents.count, id: \.self) {
+                    ForEach(0..<item.contents.count, id: \.self) {
-                        let audioContent = item.audioContents[$0]
+                        let audioContent = item.contents[$0]
                         ContentMainItemView(item: audioContent)
                     }
                 }

SodaLive/Sources/Content/Main/ContentMainItemView.swift

@@ -20,17 +20,6 @@ struct ContentMainItemView: View {
                     .scaledToFill()
                     .frame(width: 133.3, height: 133.3, alignment: .top)
                     .cornerRadius(2.7)
-                
-                if item.isAdult {
-                    Text("19")
-                        .font(.custom(Font.bold.rawValue, size: 11.3))
-                        .foregroundColor(Color.white)
-                        .padding(4)
-                        .background(Color(hex: "e53621"))
-                        .clipShape(Circle())
-                        .padding(.top, 4.3)
-                        .padding(.leading, 4.3)
-                }
             }
             
             Text(item.title)

SodaLive/Sources/Content/Main/ContentMainViewModel.swift

@@ -77,6 +77,7 @@ final class ContentMainViewModel: ObservableObject {
                         self.isShowPopup = true
                     }
                 } catch {
+                    print(error)
                     self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
                     self.isShowPopup = true
                     self.isLoading = false

SodaLive/Sources/Content/Main/GetAudioContentMainResponse.swift

@@ -35,7 +35,7 @@ struct GetAudioContentMainItem: Decodable {
 struct GetAudioContentCurationResponse: Decodable {
     let title: String
     let description: String
-    let audioContents: [GetAudioContentMainItem]
+    let contents: [GetAudioContentMainItem]
 }
 
 struct GetAudioContentBannerResponse: Decodable {

SodaLive/Sources/ContentView.swift

@@ -101,6 +101,9 @@ struct ContentView: View {
             case .modifyContent(let contentId):
                 ContentModifyView(contentId: contentId)
                 
+            case .contentListAll(let userId):
+                ContentListView(userId: userId)
+                
             case .contentDetail(let contentId):
                 ContentDetailView(contentId: contentId)
                 
@@ -142,6 +145,9 @@ struct ContentView: View {
             case .profileUpdate(let refresh):
                 ProfileUpdateView(refresh: refresh)
                 
+            case .followingList:
+                FollowCreatorView()
+                
             default:
                 EmptyView()
                     .frame(width: 0, height: 0, alignment: .topLeading)

SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift

@@ -70,6 +70,8 @@ struct LiveRoomPasswordDialog: View {
                                     .foregroundColor(Color(hex: "ffffff"))
                                 
                                 Image("ic_can")
+                                    .resizable()
+                                    .frame(width: 20, height: 20)
                                     
                                 Text("으로 입장")
                                     .font(.custom(Font.bold.rawValue, size: 15.3))

SodaLive/Sources/Explorer/Profile/GetCreatorProfileResponse.swift

@@ -12,6 +12,7 @@ struct GetCreatorProfileResponse: Decodable {
     let userDonationRanking: [UserDonationRankingResponse]
     let similarCreatorList: [SimilarCreatorResponse]
     let liveRoomList: [LiveRoomResponse]
+    let contentList: [GetAudioContentListItem]
     let notice: String
     let cheers: GetCheersResponse
     let activitySummary: GetCreatorActivitySummary

SodaLive/Sources/Explorer/Profile/UserProfileContentView.swift

@@ -24,7 +24,9 @@ struct UserProfileContentView: View {
                 Text("전체보기")
                     .font(.custom(Font.medium.rawValue, size: 12))
                     .foregroundColor(Color(hex: "bbbbbb"))
-                    .onTapGesture {}
+                    .onTapGesture {
+                        AppState.shared.setAppStep(step: .contentListAll(userId: userId))
+                    }
             }
             
             if userId == UserDefaults.int(forKey: .userId) {
@@ -44,7 +46,13 @@ struct UserProfileContentView: View {
                     let item = items[index]
                     ContentListItemView(item: item)
                         .contentShape(Rectangle())
-                        .onTapGesture {}
+                        .onTapGesture {
+                            AppState
+                                .shared
+                                .setAppStep(
+                                    step: .contentDetail(contentId: item.contentId)
+                                )
+                        }
                 }
             }
             .padding(.top, 21)

SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift

@@ -37,17 +37,6 @@ struct UserProfileLiveView: View {
                                     .clipped()
                                     .cornerRadius(4.7)
                                 
-                                if liveRoom.isAdult {
-                                    Text("19")
-                                        .font(.custom(Font.bold.rawValue, size: 11.3))
-                                        .foregroundColor(Color.white)
-                                        .padding(4)
-                                        .background(Color(hex: "e53621"))
-                                        .clipShape(Circle())
-                                        .padding(.top, 6.7)
-                                        .padding(.leading, 6.7)
-                                }
-
                                 if !liveRoom.isActive {
                                     Rectangle()
                                         .frame(width: 80, height: 116.7, alignment: .top)

SodaLive/Sources/Explorer/Profile/UserProfileView.swift

@@ -88,6 +88,17 @@ struct UserProfileView: View {
                                     }
                                 }
                                 
+                                if creatorProfile.contentList.count > 0 ||
+                                    userId == UserDefaults.int(forKey: .userId)
+                                {
+                                    UserProfileContentView(
+                                        userId: userId,
+                                        items: creatorProfile.contentList
+                                    )
+                                    .padding(.top, 46.7)
+                                    .padding(.horizontal, 13.3)
+                                }
+                                
                                 if creatorProfile.liveRoomList.count > 0 {
                                     UserProfileLiveView(
                                         userId: userId,

SodaLive/Sources/Follow/FollowCreatorItemView.swift

@@ -0,0 +1,54 @@
+//
+//  FollowCreatorItemView.swift
+//  SodaLive
+//
+//  Created by klaus on 2023/08/19.
+//
+
+import SwiftUI
+import Kingfisher
+
+struct FollowCreatorItemView: View {
+    
+    let creator: GetCreatorFollowingAllListItem
+    let onClickFollow: (Int) -> Void
+    let onClickUnFollow: (Int) -> Void
+    
+    @State private var isFollow = true
+    
+    var body: some View {
+        VStack(spacing: 13.3) {
+            HStack(spacing: 0) {
+                KFImage(URL(string: creator.profileImageUrl))
+                    .resizable()
+                    .frame(width: 60, height: 60)
+                    .clipShape(Circle())
+                
+                Text(creator.nickname)
+                    .font(.custom(Font.bold.rawValue, size: 16.7))
+                    .foregroundColor(Color(hex: "eeeeee"))
+                    .padding(.leading, 13.3)
+                
+                Spacer()
+                
+                Image(isFollow ? "btn_notification_selected" : "btn_notification")
+                    .onTapGesture {
+                        if isFollow {
+                            onClickUnFollow(creator.creatorId)
+                        } else {
+                            onClickFollow(creator.creatorId)
+                        }
+                        
+                        isFollow = !isFollow
+                    }
+            }
+            
+            Rectangle()
+                .foregroundColor(Color(hex: "595959"))
+                .frame(height: 0.5)
+        }
+        .onAppear {
+            isFollow = creator.isFollow
+        }
+    }
+}

SodaLive/Sources/Follow/FollowCreatorRepository.swift

@@ -0,0 +1,19 @@
+//
+//  FollowCreatorRepository.swift
+//  SodaLive
+//
+//  Created by klaus on 2023/08/19.
+//
+
+import Foundation
+import CombineMoya
+import Combine
+import Moya
+
+final class FollowCreatorRepository {
+    private let api = MoyaProvider<LiveRecommendApi>()
+    
+    func getFollowedCreatorAllList(page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.getFollowedCreatorAllList(page: page, size: size))
+    }
+}

SodaLive/Sources/Follow/FollowCreatorView.swift

@@ -0,0 +1,81 @@
+//
+//  FollowCreatorView.swift
+//  SodaLive
+//
+//  Created by klaus on 2023/08/19.
+//
+
+import SwiftUI
+
+struct FollowCreatorView: View {
+    
+    @StateObject var viewModel = FollowCreatorViewModel()
+    
+    var body: some View {
+        BaseView(isLoading: $viewModel.isLoading) {
+            VStack(spacing: 0) {
+                DetailNavigationBar(title: "팔로잉 채널리스트")
+                
+                HStack(spacing: 0) {
+                    Text("총  ")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(Color(hex: "eeeeee"))
+                    
+                    Text("\(viewModel.totalCount)")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(Color(hex: "dd4500"))
+                    
+                    Text(" 명")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(Color(hex: "eeeeee"))
+                    
+                    Spacer()
+                }
+                .padding(.horizontal, 13.3)
+                
+                ScrollView(.vertical, showsIndicators: false) {
+                    VStack(spacing: 13.3) {
+                        ForEach(0..<viewModel.creatorList.count, id: \.self) { index in
+                            let creator = viewModel.creatorList[index]
+                            
+                            FollowCreatorItemView(
+                                creator: creator,
+                                onClickFollow: { viewModel.creatorFollow(userId: $0) },
+                                onClickUnFollow: { viewModel.creatorUnFollow(userId: $0) }
+                            )
+                                .padding(.horizontal, 20)
+                                .onTapGesture {
+                                    AppState.shared
+                                        .setAppStep(step: .creatorDetail(userId: creator.creatorId))
+                                }
+                                .onAppear {
+                                    if index == viewModel.creatorList.count - 1 {
+                                        viewModel.getFollowedCreatorAllList()
+                                    }
+                                }
+                        }
+                    }
+                    .padding(.top, 13.3)
+                }
+            }
+            .onAppear {
+                viewModel.getFollowedCreatorAllList()
+            }
+            .popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .bottom, autohideIn: 2) {
+                HStack {
+                    Spacer()
+                    Text(viewModel.errorMessage)
+                        .padding(.vertical, 13.3)
+                        .frame(width: screenSize().width - 66.7, alignment: .center)
+                        .font(.custom(Font.medium.rawValue, size: 12))
+                        .background(Color(hex: "9970ff"))
+                        .foregroundColor(Color.white)
+                        .multilineTextAlignment(.leading)
+                        .cornerRadius(20)
+                        .padding(.bottom, 66.7)
+                    Spacer()
+                }
+            }
+        }
+    }
+}

SodaLive/Sources/Follow/FollowCreatorViewModel.swift

@@ -0,0 +1,108 @@
+//
+//  FollowCreatorViewModel.swift
+//  SodaLive
+//
+//  Created by klaus on 2023/08/19.
+//
+
+import Foundation
+import Moya
+import Combine
+
+final class FollowCreatorViewModel: ObservableObject {
+    private let repository = FollowCreatorRepository()
+    private var userRepository = UserRepository()
+    private var subscription = Set<AnyCancellable>()
+    
+    @Published var isLoading = false
+    @Published var errorMessage = ""
+    @Published var isShowPopup = false
+    @Published var creatorList = [GetCreatorFollowingAllListItem]()
+    
+    @Published var totalCount = 0
+    
+    var page = 1
+    var isLast = false
+    private let pageSize = 10
+    
+    func getFollowedCreatorAllList() {
+        if (!isLast && !isLoading) {
+            isLoading = true
+            
+            repository.getFollowedCreatorAllList(page: page, size: pageSize)
+                .sink { result in
+                    switch result {
+                    case .finished:
+                        DEBUG_LOG("finish")
+                    case .failure(let error):
+                        ERROR_LOG(error.localizedDescription)
+                    }
+                } receiveValue: { [unowned self] response in
+                    self.isLoading = false
+                    let responseData = response.data
+                    
+                    do {
+                        let jsonDecoder = JSONDecoder()
+                        let decoded = try jsonDecoder.decode(ApiResponse<GetCreatorFollowingAllListResponse>.self, from: responseData)
+                        self.isLoading = false
+                        
+                        if let data = decoded.data, decoded.success {
+                            if page == 1 {
+                                creatorList.removeAll()
+                            }
+                            
+                            self.totalCount = data.totalCount
+                            
+                            if !data.items.isEmpty {
+                                page += 1
+                                self.creatorList.append(contentsOf: data.items)
+                            } else {
+                                isLast = true
+                            }
+                        } else {
+                            if let message = decoded.message {
+                                self.errorMessage = message
+                            } else {
+                                self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
+                            }
+                            
+                            self.isShowPopup = true
+                        }
+                    } catch {
+                        self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
+                        self.isShowPopup = true
+                        self.isLoading = false
+                    }
+                }
+                .store(in: &subscription)
+        } else {
+            isLoading = false
+        }
+    }
+    
+    func creatorFollow(userId: Int) {
+        userRepository.creatorFollow(creatorId: userId)
+            .sink { result in
+                switch result {
+                case .finished:
+                    DEBUG_LOG("finish")
+                case .failure(let error):
+                    ERROR_LOG(error.localizedDescription)
+                }
+            } receiveValue: { _ in }
+            .store(in: &subscription)
+    }
+    
+    func creatorUnFollow(userId: Int) {
+        userRepository.creatorUnFollow(creatorId: userId)
+            .sink { result in
+                switch result {
+                case .finished:
+                    DEBUG_LOG("finish")
+                case .failure(let error):
+                    ERROR_LOG(error.localizedDescription)
+                }
+            } receiveValue: { _ in }
+            .store(in: &subscription)
+    }
+}

SodaLive/Sources/Follow/GetCreatorFollowingAllListResponse.swift

@@ -0,0 +1,20 @@
+//
+//  GetCreatorFollowingAllListResponse.swift
+//  SodaLive
+//
+//  Created by klaus on 2023/08/19.
+//
+
+import Foundation
+
+struct GetCreatorFollowingAllListResponse: Decodable {
+    let totalCount: Int
+    let items: [GetCreatorFollowingAllListItem]
+}
+
+struct GetCreatorFollowingAllListItem: Decodable {
+    let creatorId: Int
+    let nickname: String
+    let profileImageUrl: String
+    let isFollow: Bool
+}

SodaLive/Sources/IAP/StoreManager.swift

@@ -34,7 +34,14 @@ class StoreManager: NSObject, ObservableObject {
         products.removeAll()
         
         let request = SKProductsRequest(productIdentifiers: [
-            "\(Bundle.main.bundleIdentifier!).can_100"
+            "\(Bundle.main.bundleIdentifier!).can_35",
+            "\(Bundle.main.bundleIdentifier!).can_55",
+            "\(Bundle.main.bundleIdentifier!).can_105",
+            "\(Bundle.main.bundleIdentifier!).can_350",
+            "\(Bundle.main.bundleIdentifier!).can_550",
+            "\(Bundle.main.bundleIdentifier!).can_1170",
+            "\(Bundle.main.bundleIdentifier!).can_3580",
+            "\(Bundle.main.bundleIdentifier!).can_5750",
         ])
         request.delegate = self
         request.start()

SodaLive/Sources/Keyboard/KeyboardHandler.swift

@@ -26,4 +26,8 @@ final class KeyboardHandler: ObservableObject {
             .subscribe(on: DispatchQueue.main)
             .assign(to: \.self.keyboardHeight, on: self)
     }
+    
+    deinit {
+        cancellable = nil
+    }
 }

SodaLive/Sources/Live/EventBanner/SectionEventBannerView.swift

@@ -28,6 +28,7 @@ struct SectionEventBannerView: View {
                                 .tag(index)
                                 .onTapGesture {
                                     if let _ = item.detailImageUrl {
+                                        AppState.shared.setAppStep(step: .eventDetail(event: item))
                                     } else if let link = item.link, link.trimmingCharacters(in: .whitespaces).count > 0, let url = URL(string: link), UIApplication.shared.canOpenURL(url) {
                                         UIApplication.shared.open(url)
                                     }
@@ -39,6 +40,7 @@ struct SectionEventBannerView: View {
                                 .tag(index)
                                 .onTapGesture {
                                     if let _ = item.detailImageUrl {
+                                        AppState.shared.setAppStep(step: .eventDetail(event: item))
                                     } else if let link = item.link, link.trimmingCharacters(in: .whitespaces).count > 0, let url = URL(string: link), UIApplication.shared.canOpenURL(url) {
                                         UIApplication.shared.open(url)
                                     }

SodaLive/Sources/Live/LiveView.swift

@@ -31,20 +31,6 @@ struct LiveView: View {
                                     .padding(.top, 13.3)
                             }
                             
-                            if let url = URL(string: "https://blog.naver.com/sodalive_official"),
-                               UIApplication.shared.canOpenURL(url) {
-                                Image("img_how_to_use")
-                                    .resizable()
-                                    .frame(
-                                        width: screenSize().width,
-                                        height: (200 * screenSize().width) / 1080
-                                    )
-                                    .padding(.top, 21.3)
-                                    .onTapGesture {
-                                        UIApplication.shared.open(url)
-                                    }
-                            }
-                            
                             if viewModel.recommendChannelItems.count > 0 {
                                 SectionRecommendChannelView(
                                     items: viewModel.isFollowingList ?
@@ -99,7 +85,7 @@ struct LiveView: View {
                         viewModel.getSummary()
                     }
                     
-                    if !appState.isShowPlayer {
+                    if !appState.isShowPlayer && UserDefaults.string(forKey: .role) == MemberRole.CREATOR.rawValue {
                         Image("btn_make_live")
                             .padding(.trailing, 16)
                             .padding(.bottom, 16)
@@ -155,6 +141,44 @@ struct LiveView: View {
                 }
             }
         }
+        .valueChanged(value: appState.pushRoomId) { value in
+            DispatchQueue.main.async {
+                appState.setAppStep(step: .main)
+                
+                if value > 0 {
+                    viewModel.enterRoom(roomId: value)
+                }
+            }
+        }
+        .valueChanged(value: appState.pushChannelId) { value in
+            DispatchQueue.main.async {
+                appState.setAppStep(step: .main)
+                
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    if value > 0 {
+                        appState.setAppStep(step: .creatorDetail(userId: value))
+                    }
+                }
+            }
+        }
+        .valueChanged(value: appState.pushAudioContentId) { value in
+            appState.setAppStep(step: .main)
+            
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                if value > 0 {
+                    appState.setAppStep(step: .contentDetail(contentId: value))
+                }
+            }
+        }
+        .onAppear {
+            if appState.pushRoomId > 0 {
+                viewModel.enterRoom(roomId: appState.pushRoomId)
+            } else if appState.pushChannelId > 0 {
+                appState.setAppStep(step: .creatorDetail(userId: appState.pushChannelId))
+            } else if appState.pushAudioContentId > 0 {
+                appState.setAppStep(step: .contentDetail(contentId: appState.pushAudioContentId))
+            }
+        }
     }
     
     private func onCreateSuccess(response: CreateLiveRoomResponse) {

SodaLive/Sources/Live/Now/All/LiveNowAllItemView.swift

@@ -22,17 +22,6 @@ struct LiveNowAllItemView: View {
                         .frame(width: 80, height: 116.7, alignment: .top)
                         .cornerRadius(4.7)
                         .clipped()
-                    
-                    if item.isAdult {
-                        Text("19")
-                            .font(.custom(Font.bold.rawValue, size: 11.3))
-                            .foregroundColor(Color.white)
-                            .padding(4)
-                            .background(Color(hex: "e53621"))
-                            .cornerRadius(20)
-                            .padding(.top, 3.3)
-                            .padding(.leading, 3.3)
-                    }
                 }
                 
                 VStack(alignment: .leading, spacing: 0) {

SodaLive/Sources/Live/Now/LiveNowItemView.swift

@@ -47,15 +47,6 @@ struct LiveNowItemView: View {
                             .resizable()
                             .frame(width: 20, height: 20)
                     }
-                    
-                    if item.isAdult {
-                        Text("19")
-                            .font(.custom(Font.bold.rawValue, size: 11.3))
-                            .foregroundColor(Color.white)
-                            .padding(4)
-                            .background(Color(hex: "e53621"))
-                            .clipShape(Circle())
-                    }
                 }
                 .padding(.horizontal, 3.3)
                 .padding(.top, 3.3)

SodaLive/Sources/Live/Recommend/LiveRecommendApi.swift

@@ -9,6 +9,7 @@ import Foundation
 import Moya
 
 enum LiveRecommendApi {
+    case getFollowedCreatorAllList(page: Int, size: Int)
     case getFollowedChannelList
     case getRecommendChannelList
     case getRecommendLive
@@ -21,6 +22,9 @@ extension LiveRecommendApi: TargetType {
     
     var path: String {
         switch self {
+        case .getFollowedCreatorAllList:
+            return "/live/recommend/following/channel/all/list"
+            
         case .getFollowedChannelList:
             return "/live/recommend/following/channel/list"
             
@@ -34,7 +38,8 @@ extension LiveRecommendApi: TargetType {
     
     var method: Moya.Method {
         switch self {
-        case .getFollowedChannelList,
+        case .getFollowedCreatorAllList,
+                .getFollowedChannelList,
                 .getRecommendChannelList,
                 .getRecommendLive:
             return .get
@@ -47,6 +52,15 @@ extension LiveRecommendApi: TargetType {
                 .getRecommendChannelList,
                 .getRecommendLive:
             return .requestPlain
+            
+        case .getFollowedCreatorAllList(let page, let size):
+            let parameters = [
+                "page": page - 1,
+                "size": size,
+                "timezone": TimeZone.current.identifier,
+            ] as [String : Any]
+            
+            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
         }
     }
     

SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift

@@ -86,6 +86,9 @@ struct SectionRecommendChannelView: View {
                                 .lineLimit(1)
                         }
                         .onTapGesture {
+                            AppState.shared.setAppStep(
+                                step: .creatorDetail(userId: item.creatorId)
+                            )
                         }
                     }
                     
@@ -102,6 +105,7 @@ struct SectionRecommendChannelView: View {
                                 .lineLimit(1)
                         }
                         .onTapGesture {
+                            AppState.shared.setAppStep(step: .followingList)
                         }
                     }
                 }

SodaLive/Sources/Live/Reservation/All/LiveReservationAllItemView.swift

@@ -22,17 +22,6 @@ struct LiveReservationAllItemView: View {
                         .frame(width: 80, height: 116.7, alignment: .top)
                         .cornerRadius(4.7)
                         .clipped()
-                    
-                    if item.isAdult {
-                        Text("19")
-                            .font(.custom(Font.bold.rawValue, size: 11.3))
-                            .foregroundColor(Color.white)
-                            .padding(4)
-                            .background(Color(hex: "e53621"))
-                            .cornerRadius(20)
-                            .padding(.top, 3.3)
-                            .padding(.leading, 3.3)
-                    }
                 }
                 
                 HStack(alignment: .top, spacing: 0) {

SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift

@@ -22,17 +22,6 @@ struct LiveReservationItemView: View {
                         .frame(width: 80, height: 116, alignment: .top)
                         .cornerRadius(4.7)
                         .clipped()
-                    
-                    if item.isAdult {
-                        Text("19")
-                            .font(.custom(Font.bold.rawValue, size: 11.3))
-                            .foregroundColor(Color.white)
-                            .padding(4)
-                            .background(Color(hex: "e53621"))
-                            .cornerRadius(20)
-                            .padding(.top, 3.3)
-                            .padding(.leading, 3.3)
-                    }
                 }
                 
                 HStack(alignment: .top, spacing: 0) {

SodaLive/Sources/Live/Reservation/MyLiveReservationItemView.swift

@@ -34,17 +34,6 @@ struct MyLiveReservationItemView: View {
                             .frame(width: 80, height: 116, alignment: .top)
                             .cornerRadius(4.7)
                             .clipped()
-                        
-                        if item.isAdult {
-                            Text("19")
-                                .font(.custom(Font.bold.rawValue, size: 11.3))
-                                .foregroundColor(Color.white)
-                                .padding(4)
-                                .background(Color(hex: "e53621"))
-                                .cornerRadius(20)
-                                .padding(.top, 3.3)
-                                .padding(.leading, 3.3)
-                        }
                     }
                     
                     HStack(alignment: .center, spacing: 0) {

SodaLive/Sources/Live/Room/Chat/LiveRoomDonationChatItemView.swift

@@ -23,6 +23,8 @@ struct LiveRoomDonationChatItemView: View {
                     .cornerRadius(23.3)
                 
                 Image("ic_can")
+                    .resizable()
+                    .frame(width: 20, height: 20)
             }
             
             VStack(alignment: .leading, spacing: 6.7) {

SodaLive/Sources/Live/Room/Detail/GetRoomDetailResponse.swift

@@ -13,6 +13,7 @@ struct GetRoomDetailResponse: Decodable {
     let title: String
     let notice: String
     let isPaid: Bool
+    let isAdult: Bool
     let isPrivateRoom: Bool
     let password: String?
     let tags: [String]

SodaLive/Sources/Live/Room/Detail/LiveDetailView.swift

@@ -75,11 +75,23 @@ struct LiveDetailView: View {
                             if let room = viewModel.room {
                                 ScrollView(.vertical, showsIndicators: false) {
                                     VStack(spacing: 0) {
-                                        Text(room.title)
+                                        HStack(spacing: 5.3) {
-                                            .font(.custom(Font.bold.rawValue, size: 18.3))
+                                            if room.isAdult {
-                                            .foregroundColor(Color(hex: "eeeeee"))
+                                                Text("19")
-                                            .frame(width: proxy.size.width - 26.7, alignment: .leading)
+                                                    .font(.custom(Font.medium.rawValue, size: 12))
-                                            .padding(.top, 6.7)
+                                                    .foregroundColor(Color(hex: "e33621"))
+                                                    .padding(.horizontal, 5.3)
+                                                    .padding(.vertical, 3.3)
+                                                    .background(Color(hex: "601d14"))
+                                                    .cornerRadius(2.6)
+                                            }
+                                            
+                                            Text(room.title)
+                                                .font(.custom(Font.bold.rawValue, size: 18.3))
+                                                .foregroundColor(Color(hex: "eeeeee"))
+                                        }
+                                        .frame(width: proxy.size.width - 26.7, alignment: .leading)
+                                        .padding(.top, 6.7)
                                         
                                         HStack(spacing: 0) {
                                             Text(room.beginDateTime)
@@ -106,15 +118,6 @@ struct LiveDetailView: View {
                                         .padding(.top, 16.7)
                                         .frame(width: proxy.size.width - 26.7)
                                         
-                                        Rectangle()
-                                            .frame(height: 1)
-                                            .foregroundColor(Color(hex: "909090").opacity(0.5))
-                                            .padding(.top, 8)
-                                            .frame(width: proxy.size.width - 26.7)
-                                        
-                                        ParticipantView(room: room)
-                                            .frame(width: proxy.size.width - 26.7)
-                                        
                                         Rectangle()
                                             .frame(height: 1)
                                             .foregroundColor(Color(hex: "909090").opacity(0.5))
@@ -418,88 +421,6 @@ struct LiveDetailView: View {
         }
     }
     
-    @ViewBuilder
-    private func ParticipantView(room: GetRoomDetailResponse) -> some View {
-        if isExpandParticipantArea {
-            HStack(spacing: 0) {
-                Text(room.channelName.isNullOrBlank() ? "예약자" : "참가자")
-                    .font(.custom(Font.medium.rawValue, size: 12))
-                    .foregroundColor(Color(hex: "eeeeee"))
-                
-                Spacer()
-                
-                Text("\(room.numberOfParticipants)")
-                    .font(.custom(Font.medium.rawValue, size: 12))
-                    .foregroundColor(Color(hex: "9970ff"))
-                
-                Text("/\(room.numberOfParticipantsTotal)")
-                    .font(.custom(Font.medium.rawValue, size: 12))
-                    .foregroundColor(Color(hex: "bbbbbb"))
-            }
-            .padding(.top, 16.7)
-            
-            LazyVGrid(columns: columns) {
-                ForEach(room.participatingUsers, id: \.self) { user in
-                    VStack(spacing: 6.7) {
-                        KFImage(URL(string: user.profileImageUrl))
-                            .resizable()
-                            .scaledToFill()
-                            .frame(width: 46.7, height: 46.7, alignment: .top)
-                            .clipShape(Circle())
-                        
-                        Text(user.nickname)
-                            .font(.custom(Font.medium.rawValue, size: 12))
-                            .foregroundColor(Color(hex: "bbbbbb"))
-                            .lineLimit(1)
-                    }
-                }
-            }
-            .padding(.top, 16.7)
-        } else {
-            let userCount = room.numberOfParticipants > 10 ? 10 : room.numberOfParticipants
-            
-            HStack(spacing: -13.3) {
-                ForEach(0..<userCount, id: \.self) { index in
-                    let user = room.participatingUsers[index]
-                    KFImage(URL(string: user.profileImageUrl))
-                        .resizable()
-                        .scaledToFill()
-                        .frame(width: 33.3, height: 33.3, alignment: .top)
-                        .clipShape(Circle())
-                }
-                
-                Spacer()
-                
-                HStack(spacing: 0) {
-                    Text("\(room.numberOfParticipants)")
-                        .font(.custom(Font.medium.rawValue, size: 12))
-                        .foregroundColor(Color(hex: "9970ff"))
-                    
-                    Text("/\(room.numberOfParticipantsTotal)")
-                        .font(.custom(Font.medium.rawValue, size: 12))
-                        .foregroundColor(Color(hex: "bbbbbb"))
-                }
-            }
-            .padding(.top, 22)
-        }
-        
-        if room.numberOfParticipants > 0 {
-            HStack(spacing: 6.7) {
-                Image(isExpandParticipantArea ? "ic_live_detail_top" : "ic_live_detail_bottom")
-                    .resizable()
-                    .frame(width: 20, height: 20)
-                
-                Text(isExpandParticipantArea ? "닫기" : "펼쳐보기")
-                    .font(.custom(Font.medium.rawValue, size: 12))
-                    .foregroundColor(Color(hex: "bbbbbb"))
-            }
-            .padding(.top, 13.3)
-            .onTapGesture {
-                isExpandParticipantArea.toggle()
-            }
-        }
-    }
-    
     private func hideView() {
         if let close = onClickClose {
             close()

SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift

@@ -28,7 +28,7 @@ struct LiveRoomProfileItemTitleView: View {
             }
             
             if let totalCount = totalCount {
-                Text("/\(totalCount > 9 ? 9 : totalCount - 1)")
+                Text("/\(totalCount > 4 ? 4 : totalCount - 1)")
                     .font(.custom(Font.medium.rawValue, size: 13))
                     .foregroundColor(Color(hex: "bbbbbb"))
             }

SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift

@@ -150,7 +150,7 @@ struct LiveRoomProfilesDialogView: View {
                         role: listener.role,
                         onClickChangeListener: { _ in },
                         onClickInviteSpeaker: {
-                            if viewModel.liveRoomInfo!.speakerList.count <= 9 {
+                            if viewModel.liveRoomInfo!.speakerList.count <= 4 {
                                 viewModel.inviteSpeaker(peerId: $0)
                                 viewModel.popupContent = "스피커 요청을 보냈습니다.\n잠시만 기다려 주세요."
                                 viewModel.isShowPopup = true

SodaLive/Sources/Live/Room/GetRoomInfoResponse.swift

@@ -17,6 +17,7 @@ struct GetRoomInfoResponse: Decodable {
     let creatorNickname: String
     let creatorProfileUrl: String
     let isFollowing: Bool
+    let isAdult: Bool
     let participantsCount: Int
     let totalAvailableParticipantsCount: Int
     let speakerList: [LiveRoomMember]

SodaLive/Sources/Live/Room/LiveRoomTopCreatorView.swift

@@ -11,6 +11,7 @@ import Kingfisher
 
 struct LiveRoomTopCreatorView: View {
     
+    let creatorId: Int
     var nickname: String
     var profileImageUrl: String
     var isFollowing: Bool
@@ -34,8 +35,10 @@ struct LiveRoomTopCreatorView: View {
             
             Spacer()
             
-            Image(isFollowing ? "btn_following" : "btn_follow")
+            if creatorId != UserDefaults.int(forKey: .userId) {
-                .onTapGesture { onClickFollow(isFollowing) }
+                Image(isFollowing ? "btn_following" : "btn_follow")
+                    .onTapGesture { onClickFollow(isFollowing) }
+            }
         }
     }
 }

SodaLive/Sources/Live/Room/LiveRoomView.swift

@@ -107,14 +107,27 @@ struct LiveRoomView: View {
                     if let liveRoomInfo = viewModel.liveRoomInfo {
                         ZStack {
                             VStack(alignment: .leading, spacing: 0) {
-                                Text(liveRoomInfo.title)
+                                HStack(spacing: 5.3) {
-                                    .font(.custom(Font.bold.rawValue, size: 15.3))
+                                    if liveRoomInfo.isAdult {
-                                    .foregroundColor(Color(hex: "eeeeee"))
+                                        Text("19")
-                                    .lineLimit(1)
+                                            .font(.custom(Font.medium.rawValue, size: 12))
-                                    .padding(.top, 16.7)
+                                            .foregroundColor(Color(hex: "e33621"))
-                                    .padding(.horizontal, 13.3)
+                                            .padding(.horizontal, 5.3)
+                                            .padding(.vertical, 3.3)
+                                            .background(Color(hex: "601d14"))
+                                            .cornerRadius(2.6)
+                                    }
+                                    
+                                    Text(liveRoomInfo.title)
+                                        .font(.custom(Font.bold.rawValue, size: 15.3))
+                                        .foregroundColor(Color(hex: "eeeeee"))
+                                        .lineLimit(1)
+                                }
+                                .padding(.top, 16.7)
+                                .padding(.horizontal, 13.3)
                                 
                                 LiveRoomTopCreatorView(
+                                    creatorId: liveRoomInfo.creatorId,
                                     nickname: liveRoomInfo.creatorNickname,
                                     profileImageUrl: liveRoomInfo.creatorProfileUrl,
                                     isFollowing: liveRoomInfo.isFollowing,
@@ -125,9 +138,9 @@ struct LiveRoomView: View {
                                     },
                                     onClickFollow: {
                                         if $0 {
-                                            viewModel.unRegisterNotification()
+                                            viewModel.creatorUnFollow()
                                         } else {
-                                            viewModel.registerNotification()
+                                            viewModel.creatorFollow()
                                         }
                                     }
                                 )
@@ -503,8 +516,8 @@ struct LiveRoomView: View {
                         onClickRequestSpeaker: {
                             viewModel.requestSpeaker()
                         },
-                        registerNotification: { viewModel.registerNotification() },
+                        registerNotification: { viewModel.creatorFollow() },
-                        unRegisterNotification: { viewModel.unRegisterNotification() },
+                        unRegisterNotification: { viewModel.creatorUnFollow() },
                         onClickProfile: {
                             if $0 != UserDefaults.int(forKey: .userId) {
                                 viewModel.getUserProfile(userId: $0)
@@ -526,8 +539,8 @@ struct LiveRoomView: View {
                             viewModel.setManager(userId: $0)
                         },
                         onClickReleaseManager: { viewModel.changeListener(peerId: $0, isFromManager: true) },
-                        onClickFollow: { viewModel.registerNotification(creatorId: $0, isGetUserProfile: true) },
+                        onClickFollow: { viewModel.creatorFollow(creatorId: $0, isGetUserProfile: true) },
-                        onClickUnFollow: { viewModel.unRegisterNotification(creatorId: $0, isGetUserProfile: true) },
+                        onClickUnFollow: { viewModel.creatorUnFollow(creatorId: $0, isGetUserProfile: true) },
                         onClickInviteSpeaker: { inviteSpeaker(peerId: $0) },
                         onClickChangeListener: {
                             viewModel.changeListener(peerId: $0)
@@ -610,6 +623,9 @@ struct LiveRoomView: View {
         }
         .ignoresSafeArea(.keyboard)
         .edgesIgnoringSafeArea(keyboardHandler.keyboardHeight > 0 ? .bottom : .init())
+        .transaction { transaction in
+            transaction.animation = nil
+        }
         .sheet(
             isPresented: $viewModel.isShowShareView,
             onDismiss: { viewModel.shareMessage = "" },
@@ -674,7 +690,7 @@ struct LiveRoomView: View {
     
     
     private func inviteSpeaker(peerId: Int) {
-        if viewModel.liveRoomInfo!.speakerList.count <= 9 {
+        if viewModel.liveRoomInfo!.speakerList.count <= 4 {
             viewModel.inviteSpeaker(peerId: peerId)
             self.viewModel.popupContent = "스피커 요청을 보냈습니다.\n잠시만 기다려 주세요."
             self.viewModel.isShowPopup = true
@@ -722,7 +738,7 @@ struct LiveRoomView: View {
             Spacer()
             
             HStack(spacing: 4.7) {
-                Image("ic_donation_status")
+                Image("ic_can")
                     .resizable()
                     .frame(width: 16, height: 16)
                 

SodaLive/Sources/Live/Room/LiveRoomViewModel.swift

@@ -162,14 +162,13 @@ final class LiveRoomViewModel: NSObject, ObservableObject {
     }
     
     func quitRoom() {
-        let roomId = liveRoomInfo?.roomId
         isLoading = true
         
         if let index = muteSpeakers.firstIndex(of: UInt(UserDefaults.int(forKey: .userId))) {
             muteSpeakers.remove(at: index)
         }
         
-        repository.quitRoom(roomId: roomId!)
+        repository.quitRoom(roomId: AppState.shared.roomId)
             .sink { result in
                 switch result {
                 case .finished:
@@ -236,7 +235,7 @@ final class LiveRoomViewModel: NSObject, ObservableObject {
                         
                         getTotalDonationCan()
                         
-                        if (userId > 0) {
+                        if (userId > 0 && data.creatorId == UserDefaults.int(forKey: .userId)) {
                             let nickname = getUserNicknameAndProfileUrl(accountId: userId).nickname
                             onSuccess(nickname)
                         }
@@ -751,7 +750,7 @@ final class LiveRoomViewModel: NSObject, ObservableObject {
             .store(in: &subscription)
     }
     
-    func registerNotification(creatorId: Int? = nil, isGetUserProfile: Bool = false) {
+    func creatorFollow(creatorId: Int? = nil, isGetUserProfile: Bool = false) {
         var userId = 0
         
         if let creatorId = creatorId {
@@ -803,7 +802,7 @@ final class LiveRoomViewModel: NSObject, ObservableObject {
         }
     }
     
-    func unRegisterNotification(creatorId: Int? = nil, isGetUserProfile: Bool = false) {
+    func creatorUnFollow(creatorId: Int? = nil, isGetUserProfile: Bool = false) {
         var userId = 0
         
         if let creatorId = creatorId {
@@ -1281,7 +1280,7 @@ extension LiveRoomViewModel: AgoraRtmDelegate {
                     self.popupConfirmTitle = "스피커로 초대"
                     self.popupConfirmAction = {
                         self.isShowPopup = false
-                        if self.liveRoomInfo!.speakerList.count <= 9 {
+                        if self.liveRoomInfo!.speakerList.count <= 4 {
                             self.requestSpeakerAllow(peerId)
                         } else {
                             self.errorMessage = "스피커 정원이 초과되었습니다."

SodaLive/Sources/Main/Home/BottomTabView.swift

@@ -15,31 +15,6 @@ struct BottomTabView: View {
         HStack(spacing: 0) {
             let tabWidth = width / 5
             
-            TabButton(
-                title: "라이브",
-                action: {
-                    if currentTab != .live {
-                        currentTab = .live
-                    }
-                },
-                image: {
-                    currentTab == .live ?
-                    "ic_tabbar_live_selected" :
-                    "ic_tabbar_live_normal"
-                },
-                fontName: {
-                    currentTab == .live ?
-                    Font.bold.rawValue :
-                    Font.medium.rawValue
-                },
-                color: {
-                    currentTab == .live ?
-                    Color(hex: "9970ff") :
-                    Color(hex: "909090")
-                },
-                width: tabWidth
-            )
-            
             TabButton(
                 title: "콘텐츠",
                 action: {
@@ -65,6 +40,31 @@ struct BottomTabView: View {
                 width: tabWidth
             )
             
+            TabButton(
+                title: "라이브",
+                action: {
+                    if currentTab != .live {
+                        currentTab = .live
+                    }
+                },
+                image: {
+                    currentTab == .live ?
+                    "ic_tabbar_live_selected" :
+                    "ic_tabbar_live_normal"
+                },
+                fontName: {
+                    currentTab == .live ?
+                    Font.bold.rawValue :
+                    Font.medium.rawValue
+                },
+                color: {
+                    currentTab == .live ?
+                    Color(hex: "9970ff") :
+                    Color(hex: "909090")
+                },
+                width: tabWidth
+            )
+            
             TabButton(
                 title: "탐색",
                 action: {

SodaLive/Sources/Main/Home/HomeView.swift

@@ -146,15 +146,9 @@ struct HomeView: View {
     }
     
     private func pushTokenUpdate() {
-        Messaging.messaging().token { token, error in
+        let token = UserDefaults.string(forKey: .pushToken)
-            if let error = error {
+        if !token.trimmingCharacters(in: .whitespaces).isEmpty {
-                DEBUG_LOG(error.localizedDescription)
+            self.viewModel.pushTokenUpdate(pushToken: token)
-            } else {
-                if let token = token {
-                    UserDefaults.set(token, forKey: .pushToken)
-                    self.viewModel.pushTokenUpdate(pushToken: token)
-                }
-            }
         }
     }
 }

SodaLive/Sources/Main/Home/HomeViewModel.swift

@@ -19,7 +19,7 @@ final class HomeViewModel: ObservableObject {
         case content, live, explorer, message, mypage
     }
     
-    @Published var currentTab: CurrentTab = .live
+    @Published var currentTab: CurrentTab = .content
     
     func pushTokenUpdate(pushToken: String) {
         userRepository.updatePushToken(pushToken: pushToken)

SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift

@@ -116,7 +116,7 @@ struct CanPaymentView: View {
                                         .font(.custom(Font.medium.rawValue, size: 12))
                                         .foregroundColor(Color(hex: "777777"))
                                     
-                                    Text("자세한 내용은 요즘라이브 이용약관에서 확인할 수 있습니다.")
+                                    Text("자세한 내용은 소다라이브 이용약관에서 확인할 수 있습니다.")
                                         .font(.custom(Font.medium.rawValue, size: 12))
                                         .foregroundColor(Color(hex: "777777"))
                                         .fixedSize(horizontal: false, vertical: true)

SodaLive/Sources/MyPage/Can/Payment/CanPgPaymentView.swift

@@ -205,7 +205,7 @@ struct CanPgPaymentView: View {
                                             .font(.custom(Font.medium.rawValue, size: 12))
                                             .foregroundColor(Color(hex: "777777"))
                                         
-                                        Text("자세한 내용은 요즘라이브 이용약관에서 확인할 수 있습니다.")
+                                        Text("자세한 내용은 소다라이브 이용약관에서 확인할 수 있습니다.")
                                             .font(.custom(Font.medium.rawValue, size: 12))
                                             .foregroundColor(Color(hex: "777777"))
                                             .fixedSize(horizontal: false, vertical: true)

SodaLive/Sources/MyPage/Can/Status/CanStatusView.swift

@@ -144,11 +144,11 @@ struct CanStatusView: View {
                         
                         Text("충전하기")
                             .font(.custom(Font.bold.rawValue, size: 18.3))
-                            .foregroundColor(Color.black)
+                            .foregroundColor(Color(hex: "1313bc"))
                     }
                     .padding(.vertical, 16)
                     .frame(width: screenSize().width - 26.7)
-                    .background(Color(hex: "fdca2f"))
+                    .background(Color(hex: "80d8ff"))
                     .cornerRadius(10)
                     .padding(.vertical, 13.7)
                     .frame(width: screenSize().width)

SodaLive/Sources/MyPage/CanCardView.swift

@@ -20,6 +20,8 @@ struct CanCardView: View {
                         .foregroundColor(Color(hex: "eeeeee"))
                     
                     Image("ic_can")
+                        .resizable()
+                        .frame(width: 20, height: 20)
                     
                     Image("ic_forward")
                         .resizable()

SodaLive/Sources/MyPage/MyPageView.swift

@@ -96,15 +96,28 @@ struct MyPageView: View {
                                     
                                     ServiceCenterButtonView()
                                         .padding(.top, 40)
-                                        .padding(.bottom, data.isAuth ? 40 : 0)
                                     
                                     if !data.isAuth {
                                         AuthButtonView()
-                                            .padding(.vertical, 40)
+                                            .padding(.top, 40)
                                             .onTapGesture {
                                                 viewModel.isShowAuthView = true
                                             }
                                     }
+                                    
+                                    if let url = URL(string: "https://blog.naver.com/sodalive_official"),
+                                       UIApplication.shared.canOpenURL(url) {
+                                        Image("img_how_to_use")
+                                            .resizable()
+                                            .frame(
+                                                width: screenSize().width,
+                                                height: (200 * screenSize().width) / 1080
+                                            )
+                                            .padding(.vertical, 40)
+                                            .onTapGesture {
+                                                UIApplication.shared.open(url)
+                                            }
+                                    }
                                 }
                             }
                         }

SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusView.swift

@@ -52,7 +52,7 @@ struct LiveReservationStatusView: View {
                 }
             }
             .onAppear {
-                viewModel.getSudaReservationStatus()
+                viewModel.getLiveReservationStatus()
             }
         }
     }

SodaLive/Sources/MyPage/ReservationStatus/LiveReservationStatusViewModel.swift

@@ -26,7 +26,7 @@ final class LiveReservationStatusViewModel: ObservableObject {
     
     @Published var isCancelComplete = false
     
-    func getSudaReservationStatus() {
+    func getLiveReservationStatus() {
         isLoading = true
         
         repository.getReservations(isActive: true)