한정판이 Sold Out일 때 구매한 사람도 Sold Out으로 표시되는 버그 수정

- 팔로우/팔로잉 버튼 변경

Podfile.lock

@@ -51,4 +51,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: cdff30c96e85662f4de75ddd8d54358311c1e629
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3

SodaLive.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -36,13 +36,22 @@
         "version" : "5.7.1"
       }
     },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "3e464dad87dad2d29bb29a97836789bf0f8f67d2",
+        "version" : "10.18.1"
+      }
+    },
     {
       "identity" : "firebase-ios-sdk",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/firebase-ios-sdk.git",
       "state" : {
-        "revision" : "df2171b0c6afb9e9d4f7e07669d558c510b9f6be",
-        "version" : "10.13.0"
+        "revision" : "be49849dcba96f2b5ee550d4eceb2c0fa27dade4",
+        "version" : "10.22.1"
       }
     },
     {
@@ -50,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleAppMeasurement.git",
       "state" : {
-        "revision" : "03b9beee1a61f62d32c521e172e192a1663a5e8b",
-        "version" : "10.13.0"
+        "revision" : "482cfa4e5880f0a29f66ecfd60c5a62af28bd1f0",
+        "version" : "10.22.1"
       }
     },
     {
@@ -59,8 +68,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleDataTransport.git",
       "state" : {
-        "revision" : "aae45a320fd0d11811820335b1eabc8753902a40",
-        "version" : "9.2.5"
+        "revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
+        "version" : "9.4.0"
       }
     },
     {
@@ -68,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleUtilities.git",
       "state" : {
-        "revision" : "c38ce365d77b04a9a300c31061c5227589e5597b",
-        "version" : "7.11.5"
+        "revision" : "26c898aed8bed13b8a63057ee26500abbbcb8d55",
+        "version" : "7.13.1"
       }
     },
     {
@@ -77,8 +86,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/grpc-binary.git",
       "state" : {
-        "revision" : "f1b366129d1125be7db83247e003fc333104b569",
-        "version" : "1.50.2"
+        "revision" : "a673bc2937fbe886dd1f99c401b01b6d977a9c98",
+        "version" : "1.49.1"
       }
     },
     {
@@ -90,6 +99,15 @@
         "version" : "3.1.1"
       }
     },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
+        "version" : "100.0.0"
+      }
+    },
     {
       "identity" : "kingfisher",
       "kind" : "remoteSourceControl",
@@ -180,6 +198,24 @@
         "version" : "6.6.0"
       }
     },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage.git",
+      "state" : {
+        "revision" : "59730af512c06fb569c119d737df4c1c499e001d",
+        "version" : "5.18.10"
+      }
+    },
+    {
+      "identity" : "sdwebimageswiftui",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImageSwiftUI.git",
+      "state" : {
+        "revision" : "261b6cec35686d2dc192b809ab50742b4502a73b",
+        "version" : "2.2.6"
+      }
+    },
     {
       "identity" : "swift-protobuf",
       "kind" : "remoteSourceControl",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

SodaLive/Resources/Assets.xcassets/splash/splash_bg_2024_03.imageset/Contents.json

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

SodaLive/Resources/Assets.xcassets/splash/splash_text_2024_03.imageset/Contents.json

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

SodaLive/Resources/Assets.xcassets/splash/splash_text_logo_2024_03.imageset/Contents.json

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

SodaLive/Resources/Assets.xcassets/splash/vividnext_logo.imageset/Contents.json

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

SodaLive/Resources/PrivacyInfo.xcprivacy

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>NSPrivacyAccessedAPITypes</key>
+        <array>
+            <dict>
+                <key>NSPrivacyAccessedAPITypeReasons</key>
+                <array>
+                    <string>CA92.1</string>
+                </array>
+                <key>NSPrivacyAccessedAPIType</key>
+                <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+            </dict>
+            <dict>
+                <key>NSPrivacyAccessedAPITypeReasons</key>
+                <array>
+                    <string>C617.1</string>
+                </array>
+                <key>NSPrivacyAccessedAPIType</key>
+                <string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+            </dict>
+            <dict>
+                <key>NSPrivacyAccessedAPITypeReasons</key>
+                <array>
+                    <string>35F9.1</string>
+                </array>
+                <key>NSPrivacyAccessedAPIType</key>
+                <string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+            </dict>
+            <dict>
+                <key>NSPrivacyAccessedAPITypeReasons</key>
+                <array>
+                    <string>E174.1</string>
+                </array>
+                <key>NSPrivacyAccessedAPIType</key>
+                <string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+            </dict>
+        </array>
+    </dict>
+</plist>

SodaLive/Sources/App/AppStep.swift

@@ -72,8 +72,6 @@ enum AppStep {
     
     case userProfileFanTalkAll(userId: Int)
     
-    case creatorNoticeWrite(notice: String)
-    
     case createLive(
         timeSettingMode: LiveRoomCreateViewModel.TimeSettingMode,
         onSuccess: (CreateLiveRoomResponse) -> Void
@@ -113,4 +111,14 @@ enum AppStep {
     case curationAll(title: String, curationId: Int)
     
     case contentRankingAll
+    
+    case creatorCommunityAll(creatorId: Int)
+    
+    case creatorCommunityWrite(onSuccess: () -> Void)
+    
+    case creatorCommunityModify(postId: Int, onSuccess: () -> Void)
+    
+    case canCoupon
+    
+    case contentAllByTheme(themeId: Int)
 }

SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift

@@ -0,0 +1,111 @@
+//
+//  ContentAllByThemeView.swift
+//  SodaLive
+//
+//  Created by klaus on 2/14/24.
+//
+
+import SwiftUI
+
+struct ContentAllByThemeView: View {
+    @StateObject var viewModel = ContentAllByThemeViewModel()
+    
+    let themeId: Int
+    
+    let columns = [
+        GridItem(.flexible(), alignment: .top),
+        GridItem(.flexible(), alignment: .top),
+        GridItem(.flexible(), alignment: .top)
+    ]
+    
+    var body: some View {
+        NavigationView {
+            BaseView(isLoading: $viewModel.isLoading) {
+                VStack(alignment: .leading, spacing: 0) {
+                    DetailNavigationBar(title: viewModel.theme)
+                    
+                    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)
+                    
+                    ScrollView(.vertical, showsIndicators: false) {
+                        LazyVGrid(columns: columns, spacing: 32) {
+                            ForEach(0..<viewModel.contentList.count, id: \.self) { index in
+                                ContentNewAllItemView(item: viewModel.contentList[index])
+                                    .onAppear {
+                                        if index == viewModel.contentList.count - 1 {
+                                            viewModel.getContentList()
+                                        }
+                                    }
+                            }
+                        }
+                    }
+                }
+                .onAppear {
+                    viewModel.themeId = themeId
+                    viewModel.getContentList()
+                }
+            }
+        }
+    }
+}

SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeViewModel.swift

@@ -0,0 +1,96 @@
+//
+//  ContentAllByThemeViewModel.swift
+//  SodaLive
+//
+//  Created by klaus on 2/14/24.
+//
+
+import Foundation
+import Combine
+
+final class ContentAllByThemeViewModel: ObservableObject {
+    enum Sort: String {
+        case NEWEST, PRICE_HIGH, PRICE_LOW
+    }
+    
+    private let repository = ContentRepository()
+    private var subscription = Set<AnyCancellable>()
+    
+    @Published var errorMessage = ""
+    @Published var isShowPopup = false
+    @Published var isLoading = false
+    
+    @Published var theme = ""
+    @Published var totalCount = 0
+    @Published var sort = Sort.NEWEST {
+        didSet {
+            page = 1
+            isLast = false
+            getContentList()
+        }
+    }
+    
+    @Published var contentList: [GetAudioContentMainItem] = []
+    
+    var themeId = 0
+    var page = 1
+    var isLast = false
+    private let pageSize = 10
+    
+    func getContentList() {
+        if (!isLast && !isLoading) {
+            isLoading = true
+            
+            repository.getAudioContentByTheme(
+                themeId: themeId,
+                page: page,
+                size: pageSize,
+                sort: sort
+            )
+            .sink { result in
+                switch result {
+                case .finished:
+                    DEBUG_LOG("finish")
+                case .failure(let error):
+                    ERROR_LOG(error.localizedDescription)
+                }
+            } receiveValue: { [unowned self] response in
+                let responseData = response.data
+                
+                do {
+                    let jsonDecoder = JSONDecoder()
+                    let decoded = try jsonDecoder.decode(ApiResponse<GetContentByThemeResponse>.self, from: responseData)
+                    
+                    if let data = decoded.data, decoded.success {
+                        if page == 1 {
+                            self.contentList.removeAll()
+                        }
+                        
+                        if !data.items.isEmpty {
+                            page += 1
+                            self.theme = data.theme
+                            self.totalCount = data.totalCount
+                            self.contentList.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)
+        }
+    }
+}

SodaLive/Sources/Content/All/ByTheme/GetContentByThemeResponse.swift

@@ -0,0 +1,14 @@
+//
+//  GetContentByThemeResponse.swift
+//  SodaLive
+//
+//  Created by klaus on 2/14/24.
+//
+
+import Foundation
+
+struct GetContentByThemeResponse: Decodable {
+    let theme: String
+    let totalCount: Int
+    let items: [GetAudioContentMainItem]
+}

SodaLive/Sources/Content/All/ContentNewAllItemView.swift

@@ -15,40 +15,84 @@ struct ContentNewAllItemView: View {
     @State var width: CGFloat = 0
     
     var body: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            KFImage(URL(string: item.coverImageUrl))
-                .resizable()
-                .scaledToFill()
-                .frame(width: width, height: width, alignment: .top)
-                .cornerRadius(2.7)
-            
-            Text(item.title)
-                .font(.custom(Font.medium.rawValue, size: 13.3))
-                .foregroundColor(Color(hex: "d2d2d2"))
-                .frame(width: width, alignment: .leading)
-                .multilineTextAlignment(.leading)
-                .fixedSize(horizontal: false, vertical: true)
-                .lineLimit(2)
-            
-            HStack(spacing: 5.3) {
-                KFImage(URL(string: item.creatorProfileImageUrl))
-                    .resizable()
-                    .scaledToFill()
-                    .frame(width: 21.3, height: 21.3)
-                    .clipShape(Circle())
-                    .onTapGesture { AppState.shared.setAppStep(step: .creatorDetail(userId: item.creatorId)) }
+        NavigationLink {
+            ContentDetailView(contentId: item.contentId)
+        } label: {
+            VStack(alignment: .leading, spacing: 8) {
+                ZStack(alignment: .bottom) {
+                    KFImage(URL(string: item.coverImageUrl))
+                        .resizable()
+                        .scaledToFill()
+                        .frame(width: width, height: width, alignment: .top)
+                        .cornerRadius(2.7)
+                    
+                    VStack(spacing: 0) {
+                        Spacer()
+                        
+                        HStack(spacing: 0) {
+                            HStack(spacing: 2) {
+                                if item.price > 0 {
+                                    Image("ic_card_can_gray")
+                                    
+                                    Text("\(item.price)")
+                                        .font(.custom(Font.medium.rawValue, size: 8.5))
+                                        .foregroundColor(Color.white)
+                                } else {
+                                    Text("무료")
+                                        .font(.custom(Font.medium.rawValue, size: 8.5))
+                                        .foregroundColor(Color.white)
+                                }
+                            }
+                            .padding(3)
+                            .background(Color(hex: "333333").opacity(0.7))
+                            .cornerRadius(10)
+                            .padding(.leading, 2.7)
+                            .padding(.bottom, 2.7)
+                            
+                            Spacer()
+                            
+                            HStack(spacing: 2) {
+                                Text(item.duration)
+                                    .font(.custom(Font.medium.rawValue, size: 8.5))
+                                    .foregroundColor(Color.white)
+                            }
+                            .padding(3)
+                            .background(Color(hex: "333333").opacity(0.7))
+                            .cornerRadius(10)
+                            .padding(.trailing, 2.7)
+                            .padding(.bottom, 2.7)
+                        }
+                    }
+                }
+                .frame(width: width, height: width)
                 
-                Text(item.creatorNickname)
-                    .font(.custom(Font.medium.rawValue, size: 12))
-                    .foregroundColor(Color(hex: "777777"))
-                    .lineLimit(1)
+                Text(item.title)
+                    .font(.custom(Font.medium.rawValue, size: 13.3))
+                    .foregroundColor(Color(hex: "d2d2d2"))
+                    .frame(width: width, alignment: .leading)
+                    .multilineTextAlignment(.leading)
+                    .fixedSize(horizontal: false, vertical: true)
+                    .lineLimit(2)
+                
+                HStack(spacing: 5.3) {
+                    KFImage(URL(string: item.creatorProfileImageUrl))
+                        .resizable()
+                        .scaledToFill()
+                        .frame(width: 21.3, height: 21.3)
+                        .clipShape(Circle())
+                        .onTapGesture { AppState.shared.setAppStep(step: .creatorDetail(userId: item.creatorId)) }
+                    
+                    Text(item.creatorNickname)
+                        .font(.custom(Font.medium.rawValue, size: 12))
+                        .foregroundColor(Color(hex: "777777"))
+                        .lineLimit(1)
+                }
+                .padding(.bottom, 10)
+            }
+            .frame(width: width)
+            .onAppear {
+                width = (screenSize().width - 42) / 3
             }
-            .padding(.bottom, 10)
-        }
-        .frame(width: width)
-        .onTapGesture { AppState.shared.setAppStep(step: .contentDetail(contentId: item.contentId)) }
-        .onAppear {
-            width = (screenSize().width - 40) / 2
         }
     }
 }

SodaLive/Sources/Content/All/ContentNewAllView.swift

@@ -12,68 +12,69 @@ struct ContentNewAllView: View {
     @StateObject var viewModel = ContentNewAllViewModel()
     
     let columns = [
+        GridItem(.flexible(), alignment: .top),
         GridItem(.flexible(), alignment: .top),
         GridItem(.flexible(), alignment: .top)
     ]
     
     var body: some View {
-        BaseView(isLoading: $viewModel.isLoading) {
-            VStack(spacing: 0) {
-                DetailNavigationBar(title: "새로운 콘텐츠")
-                
-                Text("※ 최근 2주간 등록된 새로운 콘텐츠 입니다.")
-                    .font(.custom(Font.medium.rawValue, size: 14.7))
-                    .foregroundColor(Color(hex: "bbbbbb"))
-                    .padding(.horizontal, 13.3)
-                    .padding(.vertical, 8)
-                    .frame(width: screenSize().width, alignment: .leading)
-                    .background(Color(hex: "222222"))
-                    .padding(.top, 13.3)
-                
-                ContentMainNewContentThemeView(
-                    themes: viewModel.themeList,
-                    selectTheme: {
-                        viewModel.selectedTheme = $0
-                    },
-                    selectedTheme: $viewModel.selectedTheme
-                ).padding(.top, 13.3)
-                
-                HStack(spacing: 0) {
-                    Text("전체")
-                        .font(.custom(Font.medium.rawValue, size: 13.3))
-                        .foregroundColor(Color(hex: "e2e2e2"))
+        NavigationView {
+            BaseView(isLoading: $viewModel.isLoading) {
+                VStack(alignment: .leading, spacing: 0) {
+                    DetailNavigationBar(title: "새로운 콘텐츠")
                     
-                    Text("\(viewModel.totalCount)")
-                        .font(.custom(Font.medium.rawValue, size: 13.3))
-                        .foregroundColor(Color(hex: "ff5c49"))
-                        .padding(.leading, 8)
+                    Text("※ 최근 2주간 등록된 새로운 콘텐츠 입니다.")
+                        .font(.custom(Font.medium.rawValue, size: 14.7))
+                        .foregroundColor(Color(hex: "bbbbbb"))
+                        .padding(.horizontal, 13.3)
+                        .padding(.vertical, 8)
+                        .frame(width: screenSize().width, alignment: .leading)
+                        .background(Color(hex: "222222"))
+                        .padding(.top, 13.3)
                     
-                    Text("개")
-                        .font(.custom(Font.medium.rawValue, size: 13.3))
-                        .foregroundColor(Color(hex: "e2e2e2"))
-                        .padding(.leading, 2)
+                    ContentMainNewContentThemeView(
+                        themes: viewModel.themeList,
+                        selectTheme: {
+                            viewModel.selectedTheme = $0
+                        },
+                        selectedTheme: $viewModel.selectedTheme
+                    ).padding(.top, 13.3)
                     
-                    Spacer()
-                }
-                .padding(.vertical, 13.3)
-                .padding(.horizontal, 20)
-                
-                ScrollView(.vertical, showsIndicators: false) {
-                    LazyVGrid(columns: columns, spacing: 13.3) {
-                        ForEach(0..<viewModel.newContentList.count, id: \.self) { index in
-                            ContentNewAllItemView(item: viewModel.newContentList[index])
-                                .onAppear {
-                                    if index == viewModel.newContentList.count - 1 {
-                                        viewModel.getNewContentList()
+                    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)
+                    }
+                    .padding(.vertical, 13.3)
+                    .padding(.horizontal, 20)
+                    
+                    ScrollView(.vertical, showsIndicators: false) {
+                        LazyVGrid(columns: columns, spacing: 32) {
+                            ForEach(0..<viewModel.newContentList.count, id: \.self) { index in
+                                ContentNewAllItemView(item: viewModel.newContentList[index])
+                                    .onAppear {
+                                        if index == viewModel.newContentList.count - 1 {
+                                            viewModel.getNewContentList()
+                                        }
                                     }
-                                }
+                            }
                         }
                     }
                 }
-            }
-            .onAppear {
-                viewModel.getThemeList()
-                viewModel.getNewContentList()
+                .onAppear {
+                    viewModel.getThemeList()
+                    viewModel.getNewContentList()
+                }
             }
         }
     }

SodaLive/Sources/Content/All/ContentRankingAllView.swift

@@ -13,144 +13,145 @@ struct ContentRankingAllView: View {
     @StateObject var viewModel = ContentRankingAllViewModel()
     
     var body: some View {
-        BaseView(isLoading: $viewModel.isLoading) {
-            VStack(spacing: 0) {
-                DetailNavigationBar(title: "인기 콘텐츠")
-                
-                VStack(spacing: 8) {
-                    Text("\(viewModel.dateString)")
-                        .font(.custom(Font.bold.rawValue, size: 14.7))
-                        .foregroundColor(Color(hex: "eeeeee"))
+        NavigationView {
+            BaseView(isLoading: $viewModel.isLoading) {
+                VStack(spacing: 0) {
+                    DetailNavigationBar(title: "인기 콘텐츠")
                     
-                    Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.")
-                        .font(.custom(Font.light.rawValue, size: 13.3))
-                        .foregroundColor(Color(hex: "bbbbbb"))
-                }
-                .padding(.vertical, 8)
-                .frame(width: screenSize().width - 26.7)
-                .background(Color(hex: "222222"))
-                .padding(.top, 13.3)
-                
-                ContentMainRankingSortView(
-                    sorts: viewModel.contentRankingSortList,
-                    selectSort: { viewModel.selectedContentRankingSort = $0 },
-                    selectedSort: $viewModel.selectedContentRankingSort
-                )
-                .frame(width: screenSize().width - 26.7)
-                .padding(.vertical, 16.7)
-                
-                ScrollView(.vertical, showsIndicators: false) {
-                    VStack(spacing: 20) {
-                        ForEach(0..<viewModel.contentRankingItemList.count, id: \.self) { index in
-                            let item = viewModel.contentRankingItemList[index]
-                            HStack(spacing: 0) {
-                                KFImage(URL(string: item.coverImageUrl))
-                                    .resizable()
-                                    .scaledToFill()
-                                    .frame(width: 66.7, height: 66.7, alignment: .top)
-                                    .clipped()
-                                    .cornerRadius(5.3)
-                                
-                                Text("\(index + 1)")
-                                    .font(.custom(Font.bold.rawValue, size: 16.7))
-                                    .foregroundColor(Color(hex: "3bb9f1"))
-                                    .padding(.horizontal, 12)
-                                
-                                VStack(alignment: .leading, spacing: 0) {
-                                    HStack(spacing: 8) {
-                                        Text(item.themeStr)
-                                            .font(.custom(Font.medium.rawValue, size: 8))
-                                            .foregroundColor(Color(hex: "3bac6a"))
-                                            .padding(2.6)
-                                            .background(Color(hex: "28312b"))
-                                            .cornerRadius(2.6)
-                                        
-                                        Text(item.duration)
-                                            .font(.custom(Font.medium.rawValue, size: 8))
-                                            .foregroundColor(Color(hex: "777777"))
-                                            .padding(2.6)
-                                            .background(Color(hex: "222222"))
-                                            .cornerRadius(2.6)
-                                    }
-                                    
-                                    Text(item.creatorNickname)
-                                        .font(.custom(Font.medium.rawValue, size: 10.7))
-                                        .foregroundColor(Color(hex: "777777"))
-                                        .padding(.vertical, 8)
-                                    
-                                    Text(item.title)
-                                        .font(.custom(Font.medium.rawValue, size: 12))
-                                        .foregroundColor(Color(hex: "d2d2d2"))
-                                        .lineLimit(2)
-                                        .padding(.top, 2.7)
-                                }
-                                
-                                Spacer()
-                                
-                                if item.price > 0 {
-                                    HStack(spacing: 8) {
-                                        Image("ic_can")
+                    VStack(spacing: 8) {
+                        Text("\(viewModel.dateString)")
+                            .font(.custom(Font.bold.rawValue, size: 14.7))
+                            .foregroundColor(Color(hex: "eeeeee"))
+                        
+                        Text("※ 인기 콘텐츠의 순위는 매주 업데이트됩니다.")
+                            .font(.custom(Font.light.rawValue, size: 13.3))
+                            .foregroundColor(Color(hex: "bbbbbb"))
+                    }
+                    .padding(.vertical, 8)
+                    .frame(width: screenSize().width - 26.7)
+                    .background(Color(hex: "222222"))
+                    .padding(.top, 13.3)
+                    
+                    ContentMainRankingSortView(
+                        sorts: viewModel.contentRankingSortList,
+                        selectSort: { viewModel.selectedContentRankingSort = $0 },
+                        selectedSort: $viewModel.selectedContentRankingSort
+                    )
+                    .frame(width: screenSize().width - 26.7)
+                    .padding(.vertical, 16.7)
+                    
+                    ScrollView(.vertical, showsIndicators: false) {
+                        LazyVStack(spacing: 20) {
+                            ForEach(0..<viewModel.contentRankingItemList.count, id: \.self) { index in
+                                let item = viewModel.contentRankingItemList[index]
+                                NavigationLink {
+                                    ContentDetailView(contentId: item.contentId)
+                                } label: {
+                                    HStack(spacing: 0) {
+                                        KFImage(URL(string: item.coverImageUrl))
                                             .resizable()
-                                            .frame(width: 17, height: 17)
+                                            .scaledToFill()
+                                            .frame(width: 66.7, height: 66.7, alignment: .top)
+                                            .clipped()
+                                            .cornerRadius(5.3)
                                         
-                                        Text("\(item.price)")
-                                            .font(.custom(Font.medium.rawValue, size: 12))
-                                            .foregroundColor(Color(hex: "909090"))
+                                        Text("\(index + 1)")
+                                            .font(.custom(Font.bold.rawValue, size: 16.7))
+                                            .foregroundColor(Color(hex: "3bb9f1"))
+                                            .padding(.horizontal, 12)
+                                        
+                                        VStack(alignment: .leading, spacing: 0) {
+                                            HStack(spacing: 8) {
+                                                Text(item.themeStr)
+                                                    .font(.custom(Font.medium.rawValue, size: 8))
+                                                    .foregroundColor(Color(hex: "3bac6a"))
+                                                    .padding(2.6)
+                                                    .background(Color(hex: "28312b"))
+                                                    .cornerRadius(2.6)
+                                                
+                                                Text(item.duration)
+                                                    .font(.custom(Font.medium.rawValue, size: 8))
+                                                    .foregroundColor(Color(hex: "777777"))
+                                                    .padding(2.6)
+                                                    .background(Color(hex: "222222"))
+                                                    .cornerRadius(2.6)
+                                            }
+                                            
+                                            Text(item.creatorNickname)
+                                                .font(.custom(Font.medium.rawValue, size: 10.7))
+                                                .foregroundColor(Color(hex: "777777"))
+                                                .padding(.vertical, 8)
+                                            
+                                            Text(item.title)
+                                                .font(.custom(Font.medium.rawValue, size: 12))
+                                                .foregroundColor(Color(hex: "d2d2d2"))
+                                                .lineLimit(2)
+                                                .padding(.top, 2.7)
+                                        }
+                                        
+                                        Spacer()
+                                        
+                                        if item.price > 0 {
+                                            HStack(spacing: 8) {
+                                                Image("ic_can")
+                                                    .resizable()
+                                                    .frame(width: 17, height: 17)
+                                                
+                                                Text("\(item.price)")
+                                                    .font(.custom(Font.medium.rawValue, size: 12))
+                                                    .foregroundColor(Color(hex: "909090"))
+                                            }
+                                        } else {
+                                            Text("무료")
+                                                .font(.custom(Font.medium.rawValue, size: 12))
+                                                .foregroundColor(Color(hex: "ffffff"))
+                                                .padding(.horizontal, 5.3)
+                                                .padding(.vertical, 2.7)
+                                                .background(Color(hex: "cf5c37"))
+                                                .cornerRadius(2.6)
+                                        }
+                                    }
+                                    .frame(height: 66.7)
+                                    .contentShape(Rectangle())
+                                    .onAppear {
+                                        if index == viewModel.contentRankingItemList.count - 1 {
+                                            viewModel.getContentRanking()
+                                        }
                                     }
-                                } else {
-                                    Text("무료")
-                                        .font(.custom(Font.medium.rawValue, size: 12))
-                                        .foregroundColor(Color(hex: "ffffff"))
-                                        .padding(.horizontal, 5.3)
-                                        .padding(.vertical, 2.7)
-                                        .background(Color(hex: "cf5c37"))
-                                        .cornerRadius(2.6)
-                                }
-                            }
-                            .frame(height: 66.7)
-                            .contentShape(Rectangle())
-                            .onTapGesture {
-                                AppState
-                                    .shared
-                                    .setAppStep(step: .contentDetail(contentId: item.contentId))
-                            }
-                            .onAppear {
-                                if index == viewModel.contentRankingItemList.count - 1 {
-                                    viewModel.getContentRanking()
                                 }
                             }
                         }
                     }
+                    .padding(13.3)
                 }
-                .padding(13.3)
-            }
-            
-            if viewModel.isLoading {
-                LoadingView()
-            }
-        }
-        .popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .top, autohideIn: 2) {
-            GeometryReader { geo in
-                HStack {
-                    Spacer()
-                    Text(viewModel.errorMessage)
-                        .padding(.vertical, 13.3)
-                        .padding(.horizontal, 6.7)
-                        .frame(width: geo.size.width - 66.7, alignment: .center)
-                        .font(.custom(Font.medium.rawValue, size: 12))
-                        .background(Color(hex: "9970ff"))
-                        .foregroundColor(Color.white)
-                        .multilineTextAlignment(.leading)
-                        .fixedSize(horizontal: false, vertical: true)
-                        .cornerRadius(20)
-                        .padding(.top, 66.7)
-                    Spacer()
+                
+                if viewModel.isLoading {
+                    LoadingView()
                 }
             }
-        }
-        .onAppear {
-            viewModel.getContentRankingSortType()
-            viewModel.getContentRanking()
+            .popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .top, autohideIn: 2) {
+                GeometryReader { geo in
+                    HStack {
+                        Spacer()
+                        Text(viewModel.errorMessage)
+                            .padding(.vertical, 13.3)
+                            .padding(.horizontal, 6.7)
+                            .frame(width: geo.size.width - 66.7, alignment: .center)
+                            .font(.custom(Font.medium.rawValue, size: 12))
+                            .background(Color(hex: "9970ff"))
+                            .foregroundColor(Color.white)
+                            .multilineTextAlignment(.leading)
+                            .fixedSize(horizontal: false, vertical: true)
+                            .cornerRadius(20)
+                            .padding(.top, 66.7)
+                        Spacer()
+                    }
+                }
+            }
+            .onAppear {
+                viewModel.getContentRankingSortType()
+                viewModel.getContentRanking()
+            }
         }
     }
 }

SodaLive/Sources/Content/Category/CategoryApi.swift

@@ -0,0 +1,45 @@
+//
+//  CategoryApi.swift
+//  SodaLive
+//
+//  Created by klaus on 2/7/24.
+//
+
+import Foundation
+import Moya
+
+enum CategoryApi {
+    case getCategoryList(creatorId: Int)
+}
+
+extension CategoryApi: TargetType {
+    var baseURL: URL {
+        return URL(string: BASE_URL)!
+    }
+    
+    var path: String {
+        switch self {
+        case .getCategoryList:
+            return "/category"
+        }
+    }
+    
+    var method: Moya.Method {
+        switch self {
+        case .getCategoryList:
+            return .get
+        }
+    }
+    
+    var task: Moya.Task {
+        switch self {
+        case .getCategoryList(let creatorId):
+            let parameters = ["creatorId": creatorId] as [String : Any]
+            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
+        }
+    }
+    
+    var headers: [String : String]? {
+        return ["Authorization": "Bearer \(UserDefaults.string(forKey: UserDefaultsKey.token))"]
+    }
+}

SodaLive/Sources/Content/Category/ContentListCategoryView.swift

@@ -0,0 +1,59 @@
+//
+//  ContentListCategoryView.swift
+//  SodaLive
+//
+//  Created by klaus on 2/7/24.
+//
+
+import SwiftUI
+
+struct ContentListCategoryView: View {
+    let categoryList: [GetCategoryListResponse]
+    let selectCategory: (Int) -> Void
+    
+    @Binding var selectedCategory: String
+    
+    var body: some View {
+        ScrollView(.horizontal, showsIndicators: false) {
+            HStack(spacing: 8) {
+                ForEach(0..<categoryList.count, id: \.self) { index in
+                    let category = categoryList[index]
+                    Text(category.category)
+                        .font(.custom(Font.medium.rawValue, size: 14.7))
+                        .foregroundColor(Color(hex: selectedCategory == category.category ? "3bb9f1" : "777777"))
+                        .padding(.horizontal, 13.3)
+                        .padding(.vertical, 9.3)
+                        .border(
+                            Color(hex: selectedCategory == category.category ? "3bb9f1" : "eeeeee"),
+                            width: 0.5
+                        )
+                        .cornerRadius(16.7)
+                        .overlay(
+                            RoundedRectangle(cornerRadius: CGFloat(16.7))
+                                .stroke(lineWidth: 0.5)
+                                .foregroundColor(Color(hex: selectedCategory == category.category ? "3bb9f1" : "eeeeee"))
+                        )
+                        .onTapGesture {
+                            if selectedCategory != category.category {
+                                selectedCategory = category.category
+                                selectCategory(category.categoryId)
+                            }
+                        }
+                }
+            }
+        }
+    }
+}
+
+#Preview {
+    
+    ContentListCategoryView(
+        categoryList: [
+            GetCategoryListResponse(categoryId: 0, category: "전체"),
+            GetCategoryListResponse(categoryId: 1, category: "test"),
+            GetCategoryListResponse(categoryId: 0, category: "test2")
+        ],
+        selectCategory: { _ in },
+        selectedCategory: .constant("전체")
+    )
+}

SodaLive/Sources/Content/Category/GetCategoryListResponse.swift

@@ -0,0 +1,13 @@
+//
+//  GetCategoryListResponse.swift
+//  SodaLive
+//
+//  Created by klaus on 2/7/24.
+//
+
+import Foundation
+
+struct GetCategoryListResponse: Decodable {
+    let categoryId: Int
+    let category: String
+}

SodaLive/Sources/Content/ContentApi.swift

@@ -9,7 +9,7 @@ import Foundation
 import Moya
 
 enum ContentApi {
-    case getAudioContentList(userId: Int, page: Int, size: Int, sort: ContentListViewModel.Sort)
+    case getAudioContentList(userId: Int, categoryId: Int, page: Int, size: Int, sort: ContentListViewModel.Sort)
     case getAudioContentDetail(audioContentId: Int)
     case likeContent(request: PutAudioContentLikeRequest)
     case registerComment(request: RegisterAudioContentCommentRequest)
@@ -22,8 +22,11 @@ enum ContentApi {
     case getAudioContentCommentReplyList(commentId: Int, page: Int, size: Int)
     case deleteAudioContent(audioContentId: Int)
     case modifyAudioContent(parameters: [MultipartFormData])
-    case getMain
+    case getNewContentUploadCreatorList
+    case getMainBannerList
+    case getMainOrderList
     case getNewContentOfTheme(theme: String)
+    case getCurationList(page: Int, size: Int)
     case donation(request: AudioContentDonationRequest)
     case modifyComment(request: ModifyCommentRequest)
     case getNewContentThemeList
@@ -31,6 +34,9 @@ enum ContentApi {
     case getAudioContentListByCurationId(curationId: Int, page: Int, size: Int, sort: ContentCurationViewModel.Sort)
     case getContentRanking(page: Int, size: Int, sortType: String)
     case getContentRankingSortType
+    case pinContent(contentId: Int)
+    case unpinContent(contentId: Int)
+    case getAudioContentByTheme(themeId: Int, page: Int, size: Int, sort: ContentAllByThemeViewModel.Sort)
 }
 
 extension ContentApi: TargetType {
@@ -79,12 +85,21 @@ extension ContentApi: TargetType {
         case .modifyAudioContent:
             return "/audio-content"
             
-        case .getMain:
-            return "/audio-content/main"
+        case .getNewContentUploadCreatorList:
+            return "/audio-content/main/new-content-upload-creator"
+            
+        case .getMainBannerList:
+            return "/audio-content/main/banner-list"
+            
+        case .getMainOrderList:
+            return "/audio-content/main/order-list"
             
         case .getNewContentOfTheme:
             return "/audio-content/main/new"
             
+        case .getCurationList:
+            return "/audio-content/main/curation-list"
+            
         case .donation:
             return "/audio-content/donation"
             
@@ -105,21 +120,33 @@ extension ContentApi: TargetType {
             
         case .getContentRankingSortType:
             return  "/audio-content/ranking-sort-type"
+            
+        case .pinContent(let contentId):
+            return  "/audio-content/pin-to-the-top/\(contentId)"
+            
+        case .unpinContent(let contentId):
+            return  "/audio-content/unpin-at-the-top/\(contentId)"
+            
+        case .getAudioContentByTheme(let themeId, _, _, _):
+            return "/audio-content/theme/\(themeId)/content"
         }
     }
     
     var method: Moya.Method {
         switch self {
         case .getAudioContentList, .getAudioContentDetail, .getOrderList, .getAudioContentThemeList,
-                .getAudioContentCommentList, .getAudioContentCommentReplyList, .getMain, .getNewContentOfTheme,
+                .getAudioContentCommentList, .getAudioContentCommentReplyList, .getNewContentOfTheme,
                 .getNewContentThemeList, .getNewContentAllOfTheme, .getAudioContentListByCurationId, .getContentRanking,
                 .getContentRankingSortType:
             return .get
             
-        case .likeContent, .modifyAudioContent, .modifyComment:
+        case .getMainBannerList, .getMainOrderList, .getNewContentUploadCreatorList, .getCurationList, .getAudioContentByTheme:
+            return .get
+            
+        case .likeContent, .modifyAudioContent, .modifyComment, .unpinContent:
             return .put
             
-        case .registerComment, .orderAudioContent, .addAllPlaybackTracking, .uploadAudioContent, .donation:
+        case .registerComment, .orderAudioContent, .addAllPlaybackTracking, .uploadAudioContent, .donation, .pinContent:
             return .post
             
         case .deleteAudioContent:
@@ -129,9 +156,10 @@ extension ContentApi: TargetType {
     
     var task: Moya.Task {
         switch self {
-        case .getAudioContentList(let userId, let page, let size, let sort):
+        case .getAudioContentList(let userId, let categoryId, let page, let size, let sort):
             let parameters = [
                 "creator-id": userId,
+                "category-id": categoryId,
                 "page": page - 1,
                 "size": size,
                 "sort-type": sort
@@ -163,7 +191,7 @@ extension ContentApi: TargetType {
         case .addAllPlaybackTracking(let request):
             return .requestJSONEncodable(request)
             
-        case .getAudioContentThemeList, .getMain:
+        case .getAudioContentThemeList, .getMainBannerList, .getMainOrderList, .getNewContentUploadCreatorList:
             return .requestPlain
             
         case .uploadAudioContent(let parameters):
@@ -236,6 +264,26 @@ extension ContentApi: TargetType {
             
         case .getContentRankingSortType:
             return .requestPlain
+            
+        case .getCurationList(let page, let size):
+            let parameters = [
+                "page": page - 1,
+                "size": size
+            ] as [String : Any]
+            
+            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
+            
+        case .pinContent, .unpinContent:
+            return .requestPlain
+            
+        case .getAudioContentByTheme(_, let page, let size, let sort):
+            let parameters = [
+                "page": page - 1,
+                "size": size,
+                "sort-type": sort
+            ] as [String : Any]
+            
+            return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString)
         }
     }
     

SodaLive/Sources/Content/ContentListItemView.swift

@@ -26,6 +26,15 @@ struct ContentListItemView: View {
                 
                 VStack(alignment: .leading, spacing: 0) {
                     HStack(spacing: 8) {
+                        if item.isScheduledToOpen {
+                            Text("오픈예정")
+                                .font(.custom(Font.medium.rawValue, size: 8))
+                                .foregroundColor(Color(hex: "3bb9f1"))
+                                .padding(2.6)
+                                .background(Color(hex: "003851"))
+                                .cornerRadius(2.6)
+                        }
+                        
                         Text(item.themeStr)
                             .font(.custom(Font.medium.rawValue, size: 8))
                             .foregroundColor(Color(hex: "3bac6a"))
@@ -39,11 +48,18 @@ struct ContentListItemView: View {
                             .padding(2.6)
                             .background(Color(hex: "222222"))
                             .cornerRadius(2.6)
+                        
+                        if item.isPin {
+                            Image("ic_pin")
+                                .resizable()
+                                .frame(width: 13.3, height: 13.3)
+                        }
                     }
                     
                     Text(item.title)
                         .font(.custom(Font.medium.rawValue, size: 12))
                         .foregroundColor(Color(hex: "d2d2d2"))
+                        .multilineTextAlignment(.leading)
                         .padding(.top, 8)
                         .padding(.bottom, 10)
                     
@@ -112,7 +128,9 @@ struct ContentListItemView_Previews: PreviewProvider {
                 duration: "00:04:43",
                 likeCount: 2,
                 commentCount: 0,
-                isAdult: false
+                isPin: true,
+                isAdult: false,
+                isScheduledToOpen: true
             )
         )
     }

SodaLive/Sources/Content/ContentListView.swift

@@ -13,148 +13,158 @@ struct ContentListView: View {
     @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)
+        NavigationView {
+            BaseView(isLoading: $viewModel.isLoading) {
+                VStack(spacing: 0) {
+                    HStack(spacing: 0) {
+                        Button {
+                            AppState.shared.back()
+                        } label: {
+                            Image("ic_back")
+                                .resizable()
+                                .frame(width: 20, height: 20)
                             
-                            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()
-                                        }
-                                    }
+                            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 !viewModel.categoryList.isEmpty {
+                        ContentListCategoryView(
+                            categoryList: viewModel.categoryList,
+                            selectCategory: { viewModel.selectCategory(categoryId: $0) },
+                            selectedCategory: $viewModel.selectedCategory
+                        )
+                        .padding(.horizontal, 13.3)
+                    }
+                    
+                    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: "3bb9f1"))
+                            .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]
+                                    NavigationLink {
+                                        ContentDetailView(contentId: audioContent.contentId)
+                                    } label: {
+                                        ContentListItemView(item: audioContent)
+                                            .contentShape(Rectangle())
+                                            .onAppear {
+                                                if index == viewModel.audioContentList.count - 1 {
+                                                    viewModel.getAudioContentList()
+                                                }
+                                            }
+                                    }
+                                }
+                            }
+                            .padding(.horizontal, 13.3)
                         }
                     }
+                    .padding(.top, 13.3)
                 }
-                .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()
+                .onAppear {
+                    viewModel.userId = userId
+                    viewModel.getCategoryList()
+                    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: "3bb9f1"))
+                            .foregroundColor(Color.white)
+                            .multilineTextAlignment(.leading)
+                            .cornerRadius(20)
+                            .padding(.bottom, 66.7)
+                        Spacer()
+                    }
                 }
             }
         }

SodaLive/Sources/Content/ContentListViewModel.swift

@@ -21,6 +21,7 @@ final class ContentListViewModel: ObservableObject {
     @Published var isShowPopup = false
     @Published var isLoading = false
     
+    @Published var categoryList: [GetCategoryListResponse] = []
     @Published var audioContentList: [GetAudioContentListItem] = []
     @Published var totalCount = 0
     @Published var sort = Sort.NEWEST {
@@ -32,18 +33,20 @@ final class ContentListViewModel: ObservableObject {
     }
     
     @Published var scrollToTop = false
+    @Published var selectedCategory: String = "전체"
     
     var userId = 0
     var page = 1
     var isLast = false
     private let pageSize = 10
+    private var categoryId = 0
     
     func getAudioContentList() {
         if (!isLast && !isLoading) {
             isLoading = true
             
             repository
-                .getAudioContentList(userId: userId, page: page, size: pageSize, sort: sort)
+                .getAudioContentList(userId: userId, categoryId: categoryId, page: page, size: pageSize, sort: sort)
                 .sink { result in
                     switch result {
                     case .finished:
@@ -64,11 +67,11 @@ final class ContentListViewModel: ObservableObject {
                                 self.scrollToTop.toggle()
                             }
                             
-                            if !data.items.isEmpty {
-                                page += 1
-                                self.totalCount = data.totalCount
-                                self.audioContentList.append(contentsOf: data.items)
-                            } else {
+                            page += 1
+                            self.totalCount = data.totalCount
+                            self.audioContentList.append(contentsOf: data.items)
+                            
+                            if data.items.isEmpty {
                                 isLast = true
                             }
                         } else {
@@ -90,4 +93,53 @@ final class ContentListViewModel: ObservableObject {
                 .store(in: &subscription)
         }
     }
+    
+    func getCategoryList() {
+        repository.getCategoryList(creatorId: userId)
+            .sink { result in
+                switch result {
+                case .finished:
+                    DEBUG_LOG("finish")
+                case .failure(let error):
+                    ERROR_LOG(error.localizedDescription)
+                }
+            } receiveValue: { [unowned self] response in
+                let responseData = response.data
+                
+                do {
+                    let jsonDecoder = JSONDecoder()
+                    let decoded = try jsonDecoder.decode(ApiResponse<[GetCategoryListResponse]>.self, from: responseData)
+                    
+                    if let data = decoded.data, decoded.success {
+                        categoryList.removeAll()
+                        
+                        if !data.isEmpty {
+                            categoryList.append(GetCategoryListResponse(categoryId: 0, category: "전체"))
+                            categoryList.append(contentsOf: data)
+                        }
+                    } else {
+                        if let message = decoded.message {
+                            self.errorMessage = message
+                        } else {
+                            self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
+                        }
+                        
+                        self.isShowPopup = true
+                    }
+                }  catch {
+                    print(error)
+                    self.errorMessage = "다시 시도해 주세요.\n계속 같은 문제가 발생할 경우 고객센터로 문의 주시기 바랍니다."
+                    self.isShowPopup = true
+                }
+            }
+            .store(in: &subscription)
+    }
+    
+    func selectCategory(categoryId: Int) {
+        self.categoryId = categoryId
+        
+        page = 1
+        isLast = false
+        getAudioContentList()
+    }
 }

SodaLive/Sources/Content/ContentRepository.swift

@@ -12,9 +12,10 @@ import Moya
 
 final class ContentRepository {
     private let api = MoyaProvider<ContentApi>()
+    private let categoryApi = MoyaProvider<CategoryApi>()
     
-    func getAudioContentList(userId: Int, page: Int, size: Int, sort: ContentListViewModel.Sort) -> AnyPublisher<Response, MoyaError> {
-        return api.requestPublisher(.getAudioContentList(userId: userId, page: page, size: size, sort: sort))
+    func getAudioContentList(userId: Int, categoryId: Int,  page: Int, size: Int, sort: ContentListViewModel.Sort) -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.getAudioContentList(userId: userId, categoryId: categoryId, page: page, size: size, sort: sort))
     }
     
     func getAudioContentDetail(audioContentId: Int) -> AnyPublisher<Response, MoyaError> {
@@ -65,14 +66,26 @@ final class ContentRepository {
         return api.requestPublisher(.modifyAudioContent(parameters: parameters))
     }
     
-    func getMain() -> AnyPublisher<Response, MoyaError> {
-        return api.requestPublisher(.getMain)
+    func getNewContentUploadCreatorList() -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.getNewContentUploadCreatorList)
+    }
+    
+    func getMainBannerList() -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.getMainBannerList)
+    }
+    
+    func getMainOrderList() -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.getMainOrderList)
     }
     
     func getNewContentOfTheme(theme: String) -> AnyPublisher<Response, MoyaError> {
         return api.requestPublisher(.getNewContentOfTheme(theme: theme))
     }
     
+    func getCurationList(page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.getCurationList(page: page, size: size))
+    }
+    
     func donation(contentId: Int, can: Int, comment: String) -> AnyPublisher<Response, MoyaError> {
         return api.requestPublisher(.donation(request: AudioContentDonationRequest(contentId: contentId, donationCan: can, comment: comment)))
     }
@@ -100,4 +113,20 @@ final class ContentRepository {
     func getContentRanking(page: Int, size: Int, sortType: String = "매출") -> AnyPublisher<Response, MoyaError> {
         return api.requestPublisher(.getContentRanking(page: page, size: size, sortType: sortType))
     }
+    
+    func pinContent(contentId: Int) -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.pinContent(contentId: contentId))
+    }
+    
+    func unpinContent(contentId: Int) -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.unpinContent(contentId: contentId))
+    }
+    
+    func getCategoryList(creatorId: Int) -> AnyPublisher<Response, MoyaError> {
+        return categoryApi.requestPublisher(.getCategoryList(creatorId: creatorId))
+    }
+    
+    func getAudioContentByTheme(themeId: Int, page: Int, size: Int, sort: ContentAllByThemeViewModel.Sort) -> AnyPublisher<Response, MoyaError> {
+        return api.requestPublisher(.getAudioContentByTheme(themeId: themeId, page: page, size: size, sort: sort))
+    }
 }

SodaLive/Sources/Content/Create/ContentCreateView.swift

@@ -16,6 +16,8 @@ struct ContentCreateView: View {
     @State private var isShowPhotoPicker = false
     @State private var isShowSelectAudioView = false
     @State private var isShowSelectThemeView = false
+    @State private var isShowSelectDateView = false
+    @State private var isShowSelectTimeView = false
     
     var body: some View {
         BaseView(isLoading: $viewModel.isLoading) {
@@ -37,7 +39,7 @@ struct ContentCreateView: View {
                                             .resizable()
                                             .scaledToFill()
                                             .frame(width: 107, height: 107)
-                                            .background(Color(hex: "3e3358"))
+                                            .background(Color(hex: "13181b"))
                                             .cornerRadius(8)
                                             .clipped()
                                     } else {
@@ -46,13 +48,13 @@ struct ContentCreateView: View {
                                             .scaledToFit()
                                             .padding(13.3)
                                             .frame(width: 107, height: 107)
-                                            .background(Color(hex: "3e3358"))
+                                            .background(Color(hex: "13181b"))
                                             .cornerRadius(8)
                                     }
                                     
                                     Image("ic_camera")
                                         .padding(10)
-                                        .background(Color(hex: "9970ff"))
+                                        .background(Color(hex: "3bb9f1"))
                                         .cornerRadius(30)
                                         .offset(x: 50, y: 36)
                                 }
@@ -67,15 +69,15 @@ struct ContentCreateView: View {
                                 
                                 Text(viewModel.fileName.trimmingCharacters(in: .whitespacesAndNewlines) == "" ? "파일선택" : viewModel.fileName)
                                     .font(.custom(Font.medium.rawValue, size: 16.7))
-                                    .foregroundColor(Color(hex: "9970ff"))
+                                    .foregroundColor(Color(hex: "3bb9f1"))
                                     .padding(.vertical, 10)
                                     .frame(maxWidth: .infinity)
-                                    .background(Color(hex: "9970ff").opacity(0.2))
+                                    .background(Color(hex: "13181b"))
                                     .cornerRadius(5.3)
                                     .overlay(
                                         RoundedCorner(radius: 8)
                                             .stroke(lineWidth: 2)
-                                            .foregroundColor(Color(hex: "9970ff"))
+                                            .foregroundColor(Color(hex: "3bb9f1"))
                                     )
                                     .padding(.top, 13.3)
                                     .onTapGesture { isShowSelectAudioView = true }
@@ -150,16 +152,16 @@ struct ContentCreateView: View {
                                          viewModel.theme!.theme :
                                             "테마 선택")
                                     .font(.custom(Font.bold.rawValue, size: 16.7))
-                                    .foregroundColor(Color(hex: "9970ff"))
+                                    .foregroundColor(Color(hex: "3bb9f1"))
                                 }
                                 .padding(.vertical, viewModel.theme != nil ? 8 : 13.3)
                                 .frame(maxWidth: .infinity)
-                                .background(Color(hex: "9970ff").opacity(0.2))
+                                .background(Color(hex: "13181b"))
                                 .cornerRadius(24)
                                 .overlay(
                                     RoundedRectangle(cornerRadius: 24)
                                         .stroke(lineWidth: 2)
-                                        .foregroundColor(Color(hex: "9970ff"))
+                                        .foregroundColor(Color(hex: "3bb9f1"))
                                 )
                                 .padding(.top, 13.3)
                                 .onTapGesture {
@@ -286,6 +288,84 @@ struct ContentCreateView: View {
                                             .frame(maxWidth: .infinity, alignment: .leading)
                                     }
                                     .padding(.top, 26.7)
+                                    
+                                    VStack(spacing: 13.3) {
+                                        Text("미리듣기")
+                                            .font(.custom(Font.bold.rawValue, size: 16.7))
+                                            .foregroundColor(Color(hex: "eeeeee"))
+                                            .frame(maxWidth: .infinity, alignment: .leading)
+                                        
+                                        HStack(spacing: 13.3) {
+                                            SelectButtonView(title: "생성", isChecked: viewModel.isGeneratePreview) {
+                                                if !viewModel.isGeneratePreview {
+                                                    viewModel.isGeneratePreview = true
+                                                }
+                                            }
+                                            
+                                            SelectButtonView(title: "생성 안 함", isChecked: !viewModel.isGeneratePreview) {
+                                                if viewModel.isGeneratePreview {
+                                                    viewModel.isGeneratePreview = false
+                                                }
+                                            }
+                                        }
+                                    }
+                                    .padding(.top, 26.7)
+                                    
+                                    if viewModel.isGeneratePreview {
+                                        VStack(spacing: 10) {
+                                            Text("미리듣기 시간 설정")
+                                                .font(.custom(Font.bold.rawValue, size: 16.7))
+                                                .foregroundColor(Color(hex: "eeeeee"))
+                                                .frame(maxWidth: .infinity, alignment: .leading)
+                                            
+                                            Text("미리듣기 시간을 직접 설정하지 않으면 콘텐츠 앞부분 30초가 자동으로 설정됩니다. 미리듣기의 시간제한은 없습니다.")
+                                                .font(.custom(Font.medium.rawValue, size: 13.3))
+                                                .foregroundColor(Color(hex: "777777"))
+                                                .frame(maxWidth: .infinity, alignment: .leading)
+                                            
+                                            HStack(spacing: 13.3) {
+                                                VStack(spacing: 5.3) {
+                                                    Text("시작 시간")
+                                                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                                                        .foregroundColor(Color(hex: "d2d2d2"))
+                                                        .frame(maxWidth: .infinity, alignment: .leading)
+                                                    
+                                                    TextField("00:00:00", text: $viewModel.previewStartTime)
+                                                        .autocapitalization(.none)
+                                                        .disableAutocorrection(true)
+                                                        .font(.custom(Font.bold.rawValue, size: 14.6))
+                                                        .foregroundColor(Color(hex: "777777"))
+                                                        .padding(.vertical, 16.7)
+                                                        .padding(.horizontal, 13.3)
+                                                        .background(Color(hex: "222222"))
+                                                        .cornerRadius(6.7)
+                                                        .keyboardType(.default)
+                                                        .multilineTextAlignment(.center)
+                                                }
+                                                
+                                                VStack(spacing: 5.3) {
+                                                    Text("종료 시간")
+                                                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                                                        .foregroundColor(Color(hex: "d2d2d2"))
+                                                        .frame(maxWidth: .infinity, alignment: .leading)
+                                                    
+                                                    TextField("00:00:30", text: $viewModel.previewEndTime)
+                                                        .autocapitalization(.none)
+                                                        .disableAutocorrection(true)
+                                                        .font(.custom(Font.bold.rawValue, size: 14.6))
+                                                        .foregroundColor(Color(hex: "777777"))
+                                                        .padding(.vertical, 16.7)
+                                                        .padding(.horizontal, 13.3)
+                                                        .background(Color(hex: "222222"))
+                                                        .cornerRadius(6.7)
+                                                        .keyboardType(.default)
+                                                        .multilineTextAlignment(.center)
+                                                }
+                                            }
+                                            .padding(.top, 3.3)
+                                        }
+                                        .padding(.top, 26.7)
+                                    }
                                 }
                             }
                             .padding(.top, 26.7)
@@ -343,62 +423,79 @@ struct ContentCreateView: View {
                             .padding(.top, 26.7)
                             .padding(.horizontal, 13.3)
                             
-                            if !viewModel.isFree {
-                                VStack(spacing: 10) {
-                                    Text("미리듣기 시간 설정")
-                                        .font(.custom(Font.bold.rawValue, size: 16.7))
-                                        .foregroundColor(Color(hex: "eeeeee"))
-                                        .frame(maxWidth: .infinity, alignment: .leading)
-                                    
-                                    Text("미리듣기 시간을 직접 설정하지 않으면 콘텐츠 앞부분 30초가 자동으로 설정됩니다. 미리듣기의 시간제한은 없습니다.")
-                                        .font(.custom(Font.medium.rawValue, size: 13.3))
-                                        .foregroundColor(Color(hex: "777777"))
-                                        .frame(maxWidth: .infinity, alignment: .leading)
-                                    
-                                    HStack(spacing: 13.3) {
-                                        VStack(spacing: 5.3) {
-                                            Text("시작 시간")
-                                                .font(.custom(Font.medium.rawValue, size: 13.3))
-                                                .foregroundColor(Color(hex: "d2d2d2"))
-                                                .frame(maxWidth: .infinity, alignment: .leading)
-                                            
-                                            TextField("00:00:00", text: $viewModel.previewStartTime)
-                                                .autocapitalization(.none)
-                                                .disableAutocorrection(true)
-                                                .font(.custom(Font.bold.rawValue, size: 14.6))
-                                                .foregroundColor(Color(hex: "777777"))
-                                                .padding(.vertical, 16.7)
-                                                .padding(.horizontal, 13.3)
-                                                .background(Color(hex: "222222"))
-                                                .cornerRadius(6.7)
-                                                .keyboardType(.default)
-                                                .multilineTextAlignment(.center)
-                                        }
-                                        
-                                        VStack(spacing: 5.3) {
-                                            Text("종료 시간")
-                                                .font(.custom(Font.medium.rawValue, size: 13.3))
-                                                .foregroundColor(Color(hex: "d2d2d2"))
-                                                .frame(maxWidth: .infinity, alignment: .leading)
-                                            
-                                            TextField("00:00:30", text: $viewModel.previewEndTime)
-                                                .autocapitalization(.none)
-                                                .disableAutocorrection(true)
-                                                .font(.custom(Font.bold.rawValue, size: 14.6))
-                                                .foregroundColor(Color(hex: "777777"))
-                                                .padding(.vertical, 16.7)
-                                                .padding(.horizontal, 13.3)
-                                                .background(Color(hex: "222222"))
-                                                .cornerRadius(6.7)
-                                                .keyboardType(.default)
-                                                .multilineTextAlignment(.center)
+                            VStack(spacing: 13.3) {
+                                Text("예약 공개")
+                                    .font(.custom(Font.bold.rawValue, size: 16.7))
+                                    .foregroundColor(Color(hex: "eeeeee"))
+                                    .frame(maxWidth: .infinity, alignment: .leading)
+                                
+                                HStack(spacing: 13.3) {
+                                    SelectButtonView(title: "지금 공개", isChecked: !viewModel.isActiveReservation) {
+                                        if viewModel.isActiveReservation {
+                                            viewModel.isActiveReservation = false
+                                        }
+                                    }
+                                    
+                                    SelectButtonView(title: "예약 공개", isChecked: viewModel.isActiveReservation) {
+                                        if !viewModel.isActiveReservation {
+                                            viewModel.isActiveReservation = true
                                         }
                                     }
-                                    .padding(.top, 3.3)
                                 }
-                                .padding(.top, 26.7)
-                                .padding(.horizontal, 13.3)
+                                
+                                if viewModel.isActiveReservation {
+                                    HStack(spacing: 13.3) {
+                                        VStack(alignment: .leading, spacing: 6.7) {
+                                            Text("예약 날짜")
+                                                .font(.custom(Font.medium.rawValue, size: 13.3))
+                                                .foregroundColor(Color(hex: "eeeeee"))
+                                            
+                                            Button(action: {
+                                                hideKeyboard()
+                                                self.isShowSelectDateView = true
+                                            }) {
+                                                Text(viewModel.releaseDateString)
+                                                    .font(.custom(Font.medium.rawValue, size: 14.7))
+                                                    .foregroundColor(Color(hex: "eeeeee"))
+                                                    .frame(maxWidth: .infinity)
+                                                    .frame(height: 48.7)
+                                                    .overlay(
+                                                        RoundedRectangle(cornerRadius: 6.7)
+                                                            .stroke(Color(hex: "3bb9f1"), lineWidth: 1.3)
+                                                    )
+                                            }
+                                        }
+                                        
+                                        VStack(alignment: .leading, spacing: 6.7) {
+                                            Text("예약 시간")
+                                                .font(.custom(Font.medium.rawValue, size: 13.3))
+                                                .foregroundColor(Color(hex: "eeeeee"))
+                                            
+                                            Button(action: {
+                                                hideKeyboard()
+                                                self.isShowSelectTimeView = true
+                                            }) {
+                                                Text(viewModel.releaseTimeString)
+                                                    .font(.custom(Font.medium.rawValue, size: 14.7))
+                                                    .foregroundColor(Color(hex: "eeeeee"))
+                                                    .frame(maxWidth: .infinity)
+                                                    .frame(height: 48.7)
+                                                    .overlay(
+                                                        RoundedRectangle(cornerRadius: 6.7)
+                                                            .stroke(Color(hex: "3bb9f1"), lineWidth: 1.3)
+                                                    )
+                                            }
+                                        }
+                                    }
+                                    .padding(.horizontal, 13.3)
+                                    .padding(.vertical, 14.2)
+                                    .frame(maxWidth: .infinity)
+                                    .background(Color(hex: "222222"))
+                                    .padding(.top, 22.7)
+                                }
                             }
+                            .padding(.top, 26.7)
+                            .padding(.horizontal, 13.3)
                             
                             VStack(spacing: 0) {
                                 HStack(alignment: .top, spacing: 0) {
@@ -407,7 +504,7 @@ struct ContentCreateView: View {
                                         .foregroundColor(Color.white)
                                         .frame(height: 50)
                                         .frame(maxWidth: .infinity)
-                                        .background(Color(hex: "9970ff"))
+                                        .background(Color(hex: "3bb9f1"))
                                         .cornerRadius(10)
                                         .padding(13.3)
                                 }
@@ -449,6 +546,14 @@ struct ContentCreateView: View {
                         }
                     }
                     
+                    if isShowSelectDateView {
+                        SelectDatePicker(selectedDate: $viewModel.releaseDate, isShowing: $isShowSelectDateView)
+                    }
+                    
+                    if isShowSelectTimeView {
+                        QuarterTimePickerView(selectedTime: $viewModel.releaseTime, isShowing: $isShowSelectTimeView)
+                    }
+                    
                     if isShowPhotoPicker {
                         ImagePicker(
                             isShowing: $isShowPhotoPicker,
@@ -494,7 +599,7 @@ struct ContentCreateView: View {
                                 .padding(.vertical, 13.3)
                                 .frame(width: screenSize().width - 66.7, alignment: .center)
                                 .font(.custom(Font.medium.rawValue, size: 12))
-                                .background(Color(hex: "9970ff"))
+                                .background(Color(hex: "3bb9f1"))
                                 .foregroundColor(Color.white)
                                 .multilineTextAlignment(.center)
                                 .cornerRadius(20)
@@ -522,11 +627,11 @@ struct SelectButtonView: View {
             
             Text(title)
                 .font(.custom(Font.bold.rawValue, size: 14.7))
-                .foregroundColor(isChecked ? .white : Color(hex: "9970ff"))
+                .foregroundColor(isChecked ? .white : Color(hex: "80D8FF"))
         }
         .frame(height: 48.7)
         .frame(maxWidth: .infinity)
-        .background(isChecked ? Color(hex: "9970ff") : Color(hex: "1f1734"))
+        .background(isChecked ? Color(hex: "3BB9F1") : Color(hex: "13181B"))
         .cornerRadius(6.7)
         .onTapGesture {
             hideKeyboard()