From 4d5ac61dbe67792e6d7cb435af1169f9ac6365a7 Mon Sep 17 00:00:00 2001
From: Yu Sung <hwchon1234@gmail.com>
Date: Thu, 20 Nov 2025 15:06:25 +0900
Subject: [PATCH] =?UTF-8?q?feat(latest-audio-content-all):=20=ED=85=8C?=
 =?UTF-8?q?=EB=A7=88=20UI=20=EB=B3=80=EA=B2=BD,=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=ED=85=9C=202=EB=8B=A8=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../All/ByTheme/ContentAllByThemeView.swift   | 25 +++++++++-----
 .../Content/All/ContentNewAllItemView.swift   |  6 +---
 .../Content/All/ContentNewAllView.swift       | 34 ++++++++++++-------
 .../Curation/ContentCurationView.swift        | 19 +++++++++--
 .../Alarm/All/ContentMainAlarmAllView.swift   | 25 +++++++++-----
 .../V2/Asmr/All/ContentMainAsmrAllView.swift  | 25 +++++++++-----
 .../ContentMainIntroduceCreatorAllView.swift  | 25 +++++++++-----
 .../Replay/All/ContentMainReplayAllView.swift | 25 +++++++++-----
 .../Sources/Home/HomeWeeklyChartView.swift    | 12 +++----
 9 files changed, 129 insertions(+), 67 deletions(-)

diff --git a/SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift b/SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift
index f723ecc..9cc1c26 100644
--- a/SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift
+++ b/SodaLive/Sources/Content/All/ByTheme/ContentAllByThemeView.swift
@@ -12,12 +12,6 @@ struct ContentAllByThemeView: View {
     
     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) {
@@ -88,10 +82,25 @@ struct ContentAllByThemeView: View {
                     .padding(.vertical, 13.3)
                     .padding(.horizontal, 20)
                     
+                    let horizontalPadding: CGFloat = 16
+                    let gridSpacing: CGFloat = 16
+                    let itemSize = (screenSize().width - (horizontalPadding * 2) - gridSpacing) / 2
+                    
                     ScrollView(.vertical, showsIndicators: false) {
-                        LazyVGrid(columns: columns, spacing: 32) {
+                        LazyVGrid(
+                            columns: Array(
+                                repeating: GridItem(
+                                    .flexible(),
+                                    spacing: gridSpacing,
+                                    alignment: .topLeading
+                                ),
+                                count: 2
+                            ),
+                            alignment: .leading,
+                            spacing: gridSpacing
+                        ) {
                             ForEach(0..<viewModel.contentList.count, id: \.self) { index in
-                                ContentNewAllItemView(item: viewModel.contentList[index])
+                                ContentNewAllItemView(width: itemSize, item: viewModel.contentList[index])
                                     .onAppear {
                                         if index == viewModel.contentList.count - 1 {
                                             viewModel.getContentList()
diff --git a/SodaLive/Sources/Content/All/ContentNewAllItemView.swift b/SodaLive/Sources/Content/All/ContentNewAllItemView.swift
index 10f0220..2bc75cc 100644
--- a/SodaLive/Sources/Content/All/ContentNewAllItemView.swift
+++ b/SodaLive/Sources/Content/All/ContentNewAllItemView.swift
@@ -10,10 +10,9 @@ import Kingfisher
 
 struct ContentNewAllItemView: View {
     
+    let width: CGFloat
     let item: GetAudioContentMainItem
     
-    @State var width: CGFloat = 0
-    
     var body: some View {
         NavigationLink {
             ContentDetailView(contentId: item.contentId)
@@ -104,9 +103,6 @@ struct ContentNewAllItemView: View {
                 .padding(.bottom, 10)
             }
             .frame(width: width)
-            .onAppear {
-                width = (screenSize().width - 42) / 3
-            }
         }
     }
 }
diff --git a/SodaLive/Sources/Content/All/ContentNewAllView.swift b/SodaLive/Sources/Content/All/ContentNewAllView.swift
index a7b41f6..917e72f 100644
--- a/SodaLive/Sources/Content/All/ContentNewAllView.swift
+++ b/SodaLive/Sources/Content/All/ContentNewAllView.swift
@@ -11,12 +11,6 @@ struct ContentNewAllView: View {
     
     @StateObject var viewModel = ContentNewAllViewModel()
     
-    let columns = [
-        GridItem(.flexible(), alignment: .top),
-        GridItem(.flexible(), alignment: .top),
-        GridItem(.flexible(), alignment: .top)
-    ]
-    
     let isFree: Bool
     
     var body: some View {
@@ -33,14 +27,13 @@ struct ContentNewAllView: View {
                         .frame(width: screenSize().width, alignment: .leading)
                         .background(Color.gray22)
                     
-                    ContentMainNewContentThemeView(
-                        themes: viewModel.themeList,
+                    ContentMainContentThemeView(
+                        themeList: viewModel.themeList,
                         selectTheme: {
                             viewModel.selectedTheme = $0
                         },
                         selectedTheme: $viewModel.selectedTheme
                     )
-                    .padding(.horizontal, 20)
                     
                     HStack(spacing: 0) {
                         Text("전체")
@@ -57,12 +50,27 @@ struct ContentNewAllView: View {
                             .foregroundColor(Color(hex: "e2e2e2"))
                             .padding(.leading, 2)
                     }
-                    .padding(.horizontal, 13.3)
+                    .padding(.horizontal, 24)
                     
                     ScrollView(.vertical, showsIndicators: false) {
-                        LazyVGrid(columns: columns, spacing: 32) {
+                        let horizontalPadding: CGFloat = 24
+                        let gridSpacing: CGFloat = 16
+                        let itemSize = (screenSize().width - (horizontalPadding * 2) - gridSpacing) / 2
+                        
+                        LazyVGrid(
+                            columns: Array(
+                                repeating: GridItem(
+                                    .flexible(),
+                                    spacing: gridSpacing,
+                                    alignment: .topLeading
+                                ),
+                                count: 2
+                            ),
+                            alignment: .leading,
+                            spacing: gridSpacing
+                        ) {
                             ForEach(0..<viewModel.newContentList.count, id: \.self) { index in
-                                ContentNewAllItemView(item: viewModel.newContentList[index])
+                                ContentNewAllItemView(width: itemSize, item: viewModel.newContentList[index])
                                     .onAppear {
                                         if index == viewModel.newContentList.count - 1 {
                                             viewModel.getNewContentList()
@@ -70,7 +78,7 @@ struct ContentNewAllView: View {
                                     }
                             }
                         }
-                        .padding(.horizontal, 13.3)
+                        .padding(.horizontal, 24)
                     }
                 }
                 .onAppear {
diff --git a/SodaLive/Sources/Content/Curation/ContentCurationView.swift b/SodaLive/Sources/Content/Curation/ContentCurationView.swift
index 5cae6b2..e4ee6df 100644
--- a/SodaLive/Sources/Content/Curation/ContentCurationView.swift
+++ b/SodaLive/Sources/Content/Curation/ContentCurationView.swift
@@ -90,10 +90,25 @@ struct ContentCurationView: View {
                     .padding(.vertical, 13.3)
                     .padding(.horizontal, 20)
                     
+                    let horizontalPadding: CGFloat = 16
+                    let gridSpacing: CGFloat = 16
+                    let itemSize = (screenSize().width - (horizontalPadding * 2) - gridSpacing) / 2
+                    
                     ScrollView(.vertical, showsIndicators: false) {
-                        LazyVGrid(columns: columns, spacing: 32) {
+                        LazyVGrid(
+                            columns: Array(
+                                repeating: GridItem(
+                                    .flexible(),
+                                    spacing: gridSpacing,
+                                    alignment: .topLeading
+                                ),
+                                count: 2
+                            ),
+                            alignment: .leading,
+                            spacing: gridSpacing
+                        ) {
                             ForEach(0..<viewModel.contentList.count, id: \.self) { index in
-                                ContentNewAllItemView(item: viewModel.contentList[index])
+                                ContentNewAllItemView(width: itemSize, item: viewModel.contentList[index])
                                     .onAppear {
                                         if index == viewModel.contentList.count - 1 {
                                             viewModel.getContentList()
diff --git a/SodaLive/Sources/Content/Main/V2/Alarm/All/ContentMainAlarmAllView.swift b/SodaLive/Sources/Content/Main/V2/Alarm/All/ContentMainAlarmAllView.swift
index ce62211..02eba63 100644
--- a/SodaLive/Sources/Content/Main/V2/Alarm/All/ContentMainAlarmAllView.swift
+++ b/SodaLive/Sources/Content/Main/V2/Alarm/All/ContentMainAlarmAllView.swift
@@ -11,12 +11,6 @@ struct ContentMainAlarmAllView: View {
     
     @StateObject var viewModel = ContentMainAlarmAllViewModel()
     
-    let columns = [
-        GridItem(.flexible(), alignment: .top),
-        GridItem(.flexible(), alignment: .top),
-        GridItem(.flexible(), alignment: .top)
-    ]
-    
     var body: some View {
         NavigationView {
             BaseView(isLoading: $viewModel.isLoading) {
@@ -58,9 +52,24 @@ struct ContentMainAlarmAllView: View {
                     .padding(.horizontal, 13.3)
                     
                     ScrollView(.vertical, showsIndicators: false) {
-                        LazyVGrid(columns: columns, spacing: 32) {
+                        let horizontalPadding: CGFloat = 16
+                        let gridSpacing: CGFloat = 16
+                        let itemSize = (screenSize().width - (horizontalPadding * 2) - gridSpacing) / 2
+                        
+                        LazyVGrid(
+                            columns: Array(
+                                repeating: GridItem(
+                                    .flexible(),
+                                    spacing: gridSpacing,
+                                    alignment: .topLeading
+                                ),
+                                count: 2
+                            ),
+                            alignment: .leading,
+                            spacing: gridSpacing
+                        ) {
                             ForEach(0..<viewModel.newContentList.count, id: \.self) { index in
-                                ContentNewAllItemView(item: viewModel.newContentList[index])
+                                ContentNewAllItemView(width: itemSize, item: viewModel.newContentList[index])
                                     .onAppear {
                                         if index == viewModel.newContentList.count - 1 {
                                             viewModel.getContentMainAlarmAll()
diff --git a/SodaLive/Sources/Content/Main/V2/Asmr/All/ContentMainAsmrAllView.swift b/SodaLive/Sources/Content/Main/V2/Asmr/All/ContentMainAsmrAllView.swift
index 6f34371..0c7a007 100644
--- a/SodaLive/Sources/Content/Main/V2/Asmr/All/ContentMainAsmrAllView.swift
+++ b/SodaLive/Sources/Content/Main/V2/Asmr/All/ContentMainAsmrAllView.swift
@@ -11,12 +11,6 @@ struct ContentMainAsmrAllView: View {
     
     @StateObject var viewModel = ContentNewAllViewModel()
     
-    let columns = [
-        GridItem(.flexible(), alignment: .top),
-        GridItem(.flexible(), alignment: .top),
-        GridItem(.flexible(), alignment: .top)
-    ]
-    
     var body: some View {
         NavigationView {
             BaseView(isLoading: $viewModel.isLoading) {
@@ -49,9 +43,24 @@ struct ContentMainAsmrAllView: View {
                     .padding(.horizontal, 13.3)
                     
                     ScrollView(.vertical, showsIndicators: false) {
-                        LazyVGrid(columns: columns, spacing: 32) {
+                        let horizontalPadding: CGFloat = 16
+                        let gridSpacing: CGFloat = 16
+                        let itemSize = (screenSize().width - (horizontalPadding * 2) - gridSpacing) / 2
+                        
+                        LazyVGrid(
+                            columns: Array(
+                                repeating: GridItem(
+                                    .flexible(),
+                                    spacing: gridSpacing,
+                                    alignment: .topLeading
+                                ),
+                                count: 2
+                            ),
+                            alignment: .leading,
+                            spacing: gridSpacing
+                        ) {
                             ForEach(0..<viewModel.newContentList.count, id: \.self) { index in
-                                ContentNewAllItemView(item: viewModel.newContentList[index])
+                                ContentNewAllItemView(width: itemSize, item: viewModel.newContentList[index])
                                     .onAppear {
                                         if index == viewModel.newContentList.count - 1 {
                                             viewModel.getNewContentList()
diff --git a/SodaLive/Sources/Content/Main/V2/Free/All/ContentMainIntroduceCreatorAllView.swift b/SodaLive/Sources/Content/Main/V2/Free/All/ContentMainIntroduceCreatorAllView.swift
index 56b895f..6c498db 100644
--- a/SodaLive/Sources/Content/Main/V2/Free/All/ContentMainIntroduceCreatorAllView.swift
+++ b/SodaLive/Sources/Content/Main/V2/Free/All/ContentMainIntroduceCreatorAllView.swift
@@ -11,12 +11,6 @@ struct ContentMainIntroduceCreatorAllView: View {
     
     @StateObject var viewModel = ContentMainIntroduceCreatorAllViewModel()
     
-    let columns = [
-        GridItem(.flexible()),
-        GridItem(.flexible()),
-        GridItem(.flexible())
-    ]
-    
     var body: some View {
         NavigationView {
             BaseView(isLoading: $viewModel.isLoading) {
@@ -24,10 +18,25 @@ struct ContentMainIntroduceCreatorAllView: View {
                     DetailNavigationBar(title: "크리에이터 소개")
                     
                     ScrollView(.vertical, showsIndicators: false) {
-                        LazyVGrid(columns: columns, spacing: 13.3) {
+                        let horizontalPadding: CGFloat = 16
+                        let gridSpacing: CGFloat = 16
+                        let itemSize = (screenSize().width - (horizontalPadding * 2) - gridSpacing) / 2
+                        
+                        LazyVGrid(
+                            columns: Array(
+                                repeating: GridItem(
+                                    .flexible(),
+                                    spacing: gridSpacing,
+                                    alignment: .topLeading
+                                ),
+                                count: 2
+                            ),
+                            alignment: .leading,
+                            spacing: gridSpacing
+                        ) {
                             ForEach(0..<viewModel.introduceCreatorList.count, id: \.self) { index in
                                 let item = viewModel.introduceCreatorList[index]
-                                ContentNewAllItemView(item: item)
+                                ContentNewAllItemView(width: itemSize, item: item)
                                     .onAppear {
                                         if index == viewModel.introduceCreatorList.count - 1 {
                                             viewModel.getIntroduceCreatorList()
diff --git a/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift b/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift
index 6b0460e..a4c8240 100644
--- a/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift
+++ b/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift
@@ -11,12 +11,6 @@ struct ContentMainReplayAllView: View {
     
     @StateObject var viewModel = ContentNewAllViewModel()
     
-    let columns = [
-        GridItem(.flexible(), alignment: .top),
-        GridItem(.flexible(), alignment: .top),
-        GridItem(.flexible(), alignment: .top)
-    ]
-    
     var body: some View {
         NavigationView {
             BaseView(isLoading: $viewModel.isLoading) {
@@ -49,9 +43,24 @@ struct ContentMainReplayAllView: View {
                     .padding(.horizontal, 13.3)
                     
                     ScrollView(.vertical, showsIndicators: false) {
-                        LazyVGrid(columns: columns, spacing: 32) {
+                        let horizontalPadding: CGFloat = 16
+                        let gridSpacing: CGFloat = 16
+                        let itemSize = (screenSize().width - (horizontalPadding * 2) - gridSpacing) / 2
+                        
+                        LazyVGrid(
+                            columns: Array(
+                                repeating: GridItem(
+                                    .flexible(),
+                                    spacing: gridSpacing,
+                                    alignment: .topLeading
+                                ),
+                                count: 2
+                            ),
+                            alignment: .leading,
+                            spacing: gridSpacing
+                        ) {
                             ForEach(0..<viewModel.newContentList.count, id: \.self) { index in
-                                ContentNewAllItemView(item: viewModel.newContentList[index])
+                                ContentNewAllItemView(width: itemSize, item: viewModel.newContentList[index])
                                     .onAppear {
                                         if index == viewModel.newContentList.count - 1 {
                                             viewModel.getNewContentList()
diff --git a/SodaLive/Sources/Home/HomeWeeklyChartView.swift b/SodaLive/Sources/Home/HomeWeeklyChartView.swift
index e588c5d..ed4005e 100644
--- a/SodaLive/Sources/Home/HomeWeeklyChartView.swift
+++ b/SodaLive/Sources/Home/HomeWeeklyChartView.swift
@@ -38,13 +38,11 @@ struct HomeWeeklyChartView: View {
             }
             .padding(.horizontal, 24)
             
-            HStack(spacing: 16) {
-                ContentMainContentThemeView(
-                    themeList: sortList,
-                    selectTheme: onTapSort,
-                    selectedTheme: $selectedSort
-                )
-            }
+            ContentMainContentThemeView(
+                themeList: sortList,
+                selectTheme: onTapSort,
+                selectedTheme: $selectedSort
+            )
             
             ScrollView(.horizontal, showsIndicators: false) {
                 LazyHGrid(rows: rows, spacing: 16) {