빠진 아이콘 추가

SodaLive/Resources/Assets.xcassets/ic_alarm.imageset/Contents.json

@@ -5,11 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "loading_4.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "ic_alarm.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

SodaLive/Resources/Assets.xcassets/ic_alarm_selected.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_alarm_selected.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/ic_blog_purple.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_blog_purple.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/ic_heart_777.imageset/Contents.json

@@ -5,11 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "loading_1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "ic_heart_777.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

SodaLive/Resources/Assets.xcassets/ic_instagram_purple.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_instagram_purple.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/ic_kick_out.imageset/Contents.json

@@ -5,11 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "loading_3.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "ic_kick_out.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

SodaLive/Resources/Assets.xcassets/ic_message_send.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_message_send.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/ic_message_square_777 1.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "ic_headphones_purple.png",
+      "filename" : "ic_message_square_777.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

SodaLive/Resources/Assets.xcassets/ic_mic_paint.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_mic_paint.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/ic_mute.imageset/Contents.json

@@ -5,11 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "loading_2.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "ic_mute.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

SodaLive/Resources/Assets.xcassets/ic_place_holder.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_place_holder.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/ic_website_purple.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_website_purple.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/ic_youtube_play_purple.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_youtube_play_purple.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/img_compleate_book.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "img_compleate_book.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/img_noti_mute.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "img_noti_mute.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/img_thumb_default.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "img_thumb_default.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

SodaLive/Resources/Assets.xcassets/loading/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

SodaLive/Resources/Assets.xcassets/loading/loading_5.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "loading_5.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

SodaLive/SodaLive.entitlements

@@ -5,6 +5,8 @@
 	<key>aps-environment</key>
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
-	<array/>
+	<array>
+		<string>applinks:sodalive.page.link</string>
+	</array>
 </dict>
 </plist>

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,8 @@ enum AppStep {
     case changeNickname
     
     case profileUpdate(refresh: () -> Void)
+    
+    case followingList
+    
+    case orderListAll
 }

SodaLive/Sources/App/ObjectBoxService.swift

@@ -13,7 +13,7 @@ class ObjectBoxService {
     let playbackTrackingBox: Box<PlaybackTracking>
     
     init() {
-        let databaseName = "yozmlive"
+        let databaseName = "sodalive"
         let appSupport = try! FileManager.default.url(for: .applicationSupportDirectory,
                                                       in: .userDomainMask,
                                                       appropriateFor: nil,

SodaLive/Sources/App/SodaLiveApp.swift

@@ -58,7 +58,7 @@ struct SodaLiveApp: App {
                 .onOpenURL { url in
                     DEBUG_LOG("I have received a URL through a custom scheme! \(url.absoluteString)")
                     if let scheme = url.scheme {
-                        if scheme == "kr.co.vividnext.yozm" {
+                        if scheme == "kr.co.vividnext.sodalive" {
                             if let dynamicLink = DynamicLinks.dynamicLinks().dynamicLink(fromCustomSchemeURL: url) {
                                 self.handleIncomingDynamicLink(dynamicLink)
                             } else {

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")
-                    .resizable()
+                ActivityIndicatorView()
                     .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) {
@@ -60,7 +49,7 @@ struct ContentListItemView: View {
                     
                     HStack(spacing: 13.3) {
                         HStack(spacing: 6) {
-                            Image("ic_heart")
+                            Image("ic_heart_777")
                                 .resizable()
                                 .frame(width: 13.3, height: 13.3)
                             
@@ -88,7 +77,7 @@ struct ContentListItemView: View {
                 
                 if item.price > 0 {
                     HStack(spacing: 8) {
-                        Image("ic_coin_w")
+                        Image("ic_can")
                             .resizable()
                             .frame(width: 17, height: 17)
                         

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/ContentRepository.swift

@@ -29,8 +29,8 @@ final class ContentRepository {
         return api.requestPublisher(.registerComment(request: RegisterAudioContentCommentRequest(comment: comment, contentId: audioContentId, parentId: parentId)))
     }
     
-    func orderAudioContent(audioContentId: Int, orderType: OrderType) -> AnyPublisher<Response, MoyaError> {
-        return api.requestPublisher(.orderAudioContent(request: OrderRequest(audioContentId: audioContentId, orderType: orderType)))
+    func orderAudioContent(contentId: Int, orderType: OrderType) -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.orderAudioContent(request: OrderRequest(contentId: contentId, orderType: orderType)))
     }
     
     func getOrderList(page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
@@ -74,6 +74,6 @@ final class ContentRepository {
     }
     
     func donation(contentId: Int, can: Int, comment: String) -> AnyPublisher<Response, MoyaError> {
-        return api.requestPublisher(.donation(request: AudioContentDonationRequest(audioContentId: contentId, donationCan: can, comment: comment)))
+        return api.requestPublisher(.donation(request: AudioContentDonationRequest(contentId: contentId, donationCan: can, comment: comment)))
     }
 }

SodaLive/Sources/Content/Detail/ContentDetailViewModel.swift

@@ -198,22 +198,22 @@ final class ContentDetailViewModel: ObservableObject {
     
     func shareAudioContent(contentImage: String, contentTitle: String) {
         isLoading = true
-        guard let link = URL(string: "https://yozm.day/?audio_content_id=\(contentId)") else { return }
-        let dynamicLinksDomainURIPrefix = "https://yozm.page.link"
+        guard let link = URL(string: "https://sodalive.net/?audio_content_id=\(contentId)") else { return }
+        let dynamicLinksDomainURIPrefix = "https://sodalive.page.link"
         guard let linkBuilder = DynamicLinkComponents(link: link, domainURIPrefix: dynamicLinksDomainURIPrefix) else {
             self.errorMessage = "공유링크를 생성하지 못했습니다.\n다시 시도해 주세요."
             self.isShowPopup = true
             return
         }
         
-        linkBuilder.iOSParameters = DynamicLinkIOSParameters(bundleID: "kr.co.vividnext.yozm")
-        linkBuilder.iOSParameters?.appStoreID = "1630284226"
+        linkBuilder.iOSParameters = DynamicLinkIOSParameters(bundleID: "kr.co.vividnext.sodalive")
+        linkBuilder.iOSParameters?.appStoreID = "6461721697"
         
-        linkBuilder.androidParameters = DynamicLinkAndroidParameters(packageName: "kr.co.vividnext.yozm")
+        linkBuilder.androidParameters = DynamicLinkAndroidParameters(packageName: "kr.co.vividnext.sodalive")
         
         let socialMetaTagParameters = DynamicLinkSocialMetaTagParameters()
         socialMetaTagParameters.title = contentTitle
-        socialMetaTagParameters.descriptionText = "지금 요즘라이브에서 이 콘텐츠 감상하기"
+        socialMetaTagParameters.descriptionText = "지금 소다라이브에서 이 콘텐츠 감상하기"
         socialMetaTagParameters.imageURL = URL(string: contentImage)
         linkBuilder.socialMetaTagParameters = socialMetaTagParameters
         
@@ -280,7 +280,7 @@ final class ContentDetailViewModel: ObservableObject {
         isShowPreviewAlert = false
         isLoading = true
         
-        repository.orderAudioContent(audioContentId: contentId, orderType: orderType)
+        repository.orderAudioContent(contentId: contentId, orderType: orderType)
             .sink { result in
                 switch result {
                 case .finished:

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/Detail/ContentOrderDialogView.swift

@@ -71,7 +71,7 @@ struct ContentOrderDialogView: View {
                         Spacer()
                         
                         HStack(spacing: 8) {
-                            Image("ic_coin_w")
+                            Image("ic_can")
                                 .resizable()
                                 .frame(width: 16.7, height: 16.7)
                             

SodaLive/Sources/Content/Donation/AudioContentDonationRequest.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 struct AudioContentDonationRequest: Encodable {
-    let audioContentId: Int
+    let contentId: Int
     let donationCan: Int
     let comment: String
     let container: String = "ios"

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) {
-                        let audioContent = item.audioContents[$0]
+                    ForEach(0..<item.contents.count, id: \.self) {
+                        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/ContentMainNewContentView.swift

@@ -42,11 +42,11 @@ struct ContentMainNewContentView_Previews: PreviewProvider {
             items: [
                 GetAudioContentMainItem(
                     contentId: 1,
-                    coverImageUrl: "https://test-cf.yozm.day/audio_content_cover/31/31-cover-e78575f9-7624-471c-8102-1289a5748aae-5983-1684487894269",
+                    coverImageUrl: "https://test-cf.sodalive.net/profile/default-profile.png",
                     title: "테스트",
                     isAdult: false,
                     creatorId: 7,
-                    creatorProfileImageUrl: "https://test-cf.yozm.day/profile/7f73168e-220f-482f-b97d-baab63b70e04IMG_20220314_220855522.jpg",
+                    creatorProfileImageUrl: "https://test-cf.sodalive.net/profile/default-profile.png",
                     creatorNickname: "유저1"
                 )
             ],

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/Content/Modify/ContentModifyViewModel.swift

@@ -82,7 +82,7 @@ final class ContentModifyViewModel: ObservableObject {
             isLoading = true
             
             let request = ModifyContentRequest(
-                audioContentId: contentId,
+                contentId: contentId,
                 title: title != audioContent!.title ? title : nil,
                 detail: detail != audioContent!.detail ? detail : nil,
                 isAdult: isAdult,

SodaLive/Sources/Content/Modify/ModifyContentRequest.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 struct ModifyContentRequest: Encodable {
-    let audioContentId: Int
+    let contentId: Int
     let title: String?
     let detail: String?
     let isAdult: Bool

SodaLive/Sources/Content/Order/OrderRequest.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 struct OrderRequest: Encodable {
-    let audioContentId: Int
+    let contentId: Int
     let orderType: OrderType
     let container: String = "ios"
 }

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,12 @@ struct ContentView: View {
             case .profileUpdate(let refresh):
                 ProfileUpdateView(refresh: refresh)
                 
+            case .followingList:
+                FollowCreatorView()
+                
+            case .orderListAll:
+                OrderListAllView()
+                
             default:
                 EmptyView()
                     .frame(width: 0, height: 0, alignment: .topLeading)

SodaLive/Sources/Debug/Utils/Constants.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 let BASE_URL = "https://test-api.sodalive.net"
-let APPLY_YOZM_CREATOR = "https://forms.gle/mmhJKmijjVRnwtdZ7"
+let APPLY_SODALIVE_CREATOR = "https://forms.gle/mmhJKmijjVRnwtdZ7"
 
 let AGORA_APP_ID = "b96574e191a9430fa54c605528aa3ef7"
 let AGORA_APP_CERTIFICATE = "ae18ade3afcf4086bd4397726eb0654c"

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/Explorer/Profile/UserProfileViewModel.swift

@@ -380,18 +380,18 @@ final class UserProfileViewModel: ObservableObject {
     }
     
     func shareChannel(userId: Int) {
-        guard let link = URL(string: "https://yozm.day/?channel_id=\(userId)") else { return }
-        let dynamicLinksDomainURIPrefix = "https://yozm.page.link"
+        guard let link = URL(string: "https://sodalive.net/?channel_id=\(userId)") else { return }
+        let dynamicLinksDomainURIPrefix = "https://sodalive.page.link"
         guard let linkBuilder = DynamicLinkComponents(link: link, domainURIPrefix: dynamicLinksDomainURIPrefix) else {
             self.errorMessage = "공유링크를 생성하지 못했습니다.\n다시 시도해 주세요."
             self.isShowPopup = true
             return
         }
         
-        linkBuilder.iOSParameters = DynamicLinkIOSParameters(bundleID: "kr.co.vividnext.yozm")
-        linkBuilder.iOSParameters?.appStoreID = "1630284226"
+        linkBuilder.iOSParameters = DynamicLinkIOSParameters(bundleID: "kr.co.vividnext.sodalive")
+        linkBuilder.iOSParameters?.appStoreID = "6461721697"
         
-        linkBuilder.androidParameters = DynamicLinkAndroidParameters(packageName: "kr.co.vividnext.yozm")
+        linkBuilder.androidParameters = DynamicLinkAndroidParameters(packageName: "kr.co.vividnext.sodalive")
         
         guard let longDynamicLink = linkBuilder.url else {
             self.errorMessage = "공유링크를 생성하지 못했습니다.\n다시 시도해 주세요."
@@ -404,7 +404,7 @@ final class UserProfileViewModel: ObservableObject {
             let shortUrl = url?.absoluteString
             let urlString = shortUrl != nil ? shortUrl! : longDynamicLink.absoluteString
             
-            self.shareMessage = "요즘라이브 \(self.creatorProfile!.creator.nickname)님의 채널입니다.\n\(urlString)"
+            self.shareMessage = "소다라이브 \(self.creatorProfile!.creator.nickname)님의 채널입니다.\n\(urlString)"
             self.isShowShareView = true
         }
     }

SodaLive/Sources/Extensions/DateExtension.swift

@@ -1,6 +1,6 @@
 //
 //  DateExtension.swift
-//  yozm
+//  SodaLive
 //
 //  Created by klaus on 2022/05/27.
 //

SodaLive/Sources/Extensions/IntExtension.swift

@@ -1,6 +1,6 @@
 //
 //  IntExtension.swift
-//  yozm
+//  SodaLive
 //
 //  Created by klaus on 2022/06/21.
 //

SodaLive/Sources/Extensions/StringExtension.swift

@@ -1,6 +1,6 @@
 //
 //  StringExtension.swift
-//  yozm
+//  SodaLive
 //
 //  Created by klaus on 2022/06/03.
 //

SodaLive/Sources/Extensions/UserDefaultsExtension.swift

@@ -1,6 +1,6 @@
 //
 //  UserDefaultsExtension.swift
-//  yozm
+//  SodaLive
 //
 //  Created by klaus on 2022/05/20.
 //

SodaLive/Sources/Extensions/ViewExtension.swift

@@ -1,6 +1,6 @@
 //
 //  ViewExtension.swift
-//  yozm
+//  SodaLive
 //
 //  Created by klaus on 2022/05/19.
 //

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
+        }
+    }
+}