From 2bea2365a029d60fd1785cb97c438a18d151012c Mon Sep 17 00:00:00 2001
From: Yu Sung <hwchon1234@gmail.com>
Date: Wed, 4 Sep 2024 15:43:34 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A7=88=EC=9D=B4=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20-=20=ED=8C=94=EB=A1=9C=EC=9E=89=20=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sources/Follow/FollowCreatorView.swift    | 39 +++++++++++--------
 SodaLive/Sources/MyPage/MyPageView.swift      | 21 ++++++++--
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/SodaLive/Sources/Follow/FollowCreatorView.swift b/SodaLive/Sources/Follow/FollowCreatorView.swift
index d992864..52e5079 100644
--- a/SodaLive/Sources/Follow/FollowCreatorView.swift
+++ b/SodaLive/Sources/Follow/FollowCreatorView.swift
@@ -14,36 +14,37 @@ struct FollowCreatorView: View {
     var body: some View {
         BaseView(isLoading: $viewModel.isLoading) {
             VStack(spacing: 0) {
-                DetailNavigationBar(title: "팔로잉 채널리스트")
+                DetailNavigationBar(title: "팔로잉 리스트")
                 
                 HStack(spacing: 0) {
                     Text("총  ")
                         .font(.custom(Font.medium.rawValue, size: 13.3))
-                        .foregroundColor(Color(hex: "eeeeee"))
+                        .foregroundColor(Color.grayee)
                     
                     Text("\(viewModel.totalCount)")
                         .font(.custom(Font.medium.rawValue, size: 13.3))
-                        .foregroundColor(Color(hex: "dd4500"))
+                        .foregroundColor(Color.mainRed3)
                     
                     Text(" 명")
                         .font(.custom(Font.medium.rawValue, size: 13.3))
-                        .foregroundColor(Color(hex: "eeeeee"))
+                        .foregroundColor(Color.grayee)
                     
                     Spacer()
                 }
                 .padding(.horizontal, 13.3)
                 .padding(.top, 6.7)
                 
-                ScrollView(.vertical, showsIndicators: false) {
-                    VStack(spacing: 13.3) {
-                        ForEach(0..<viewModel.creatorList.count, id: \.self) { index in
-                            let creator = viewModel.creatorList[index]
-                            
-                            FollowCreatorItemView(
-                                creator: creator,
-                                onClickFollow: { viewModel.creatorFollow(userId: $0) },
-                                onClickUnFollow: { viewModel.creatorUnFollow(userId: $0) }
-                            )
+                if viewModel.totalCount > 0 {
+                    ScrollView(.vertical, showsIndicators: false) {
+                        VStack(spacing: 13.3) {
+                            ForEach(0..<viewModel.creatorList.count, id: \.self) { index in
+                                let creator = viewModel.creatorList[index]
+                                
+                                FollowCreatorItemView(
+                                    creator: creator,
+                                    onClickFollow: { viewModel.creatorFollow(userId: $0) },
+                                    onClickUnFollow: { viewModel.creatorUnFollow(userId: $0) }
+                                )
                                 .padding(.horizontal, 20)
                                 .onTapGesture {
                                     AppState.shared
@@ -54,9 +55,15 @@ struct FollowCreatorView: View {
                                         viewModel.getFollowedCreatorAllList()
                                     }
                                 }
+                            }
                         }
+                        .padding(.top, 13.3)
                     }
-                    .padding(.top, 13.3)
+                } else {
+                    Text("팔로우 중인 채널이 없습니다.")
+                        .font(.custom(Font.medium.rawValue, size: 13.3))
+                        .foregroundColor(Color.grayee)
+                        .frame(maxHeight: .infinity)
                 }
             }
             .onAppear {
@@ -69,7 +76,7 @@ struct FollowCreatorView: View {
                         .padding(.vertical, 13.3)
                         .frame(width: screenSize().width - 66.7, alignment: .center)
                         .font(.custom(Font.medium.rawValue, size: 12))
-                        .background(Color(hex: "3bb9f1"))
+                        .background(Color.button)
                         .foregroundColor(Color.white)
                         .multilineTextAlignment(.leading)
                         .cornerRadius(20)
diff --git a/SodaLive/Sources/MyPage/MyPageView.swift b/SodaLive/Sources/MyPage/MyPageView.swift
index b09c077..83e01a8 100644
--- a/SodaLive/Sources/MyPage/MyPageView.swift
+++ b/SodaLive/Sources/MyPage/MyPageView.swift
@@ -72,8 +72,8 @@ struct MyPageView: View {
                                         Text("내 채널 보기")
                                             .frame(width: screenSize().width - 26.7, height: 46.7)
                                             .font(.custom(Font.bold.rawValue, size: 15.3))
-                                            .foregroundColor(Color(hex: "eeeeee"))
-                                            .background(Color(hex: "3bb9f1"))
+                                            .foregroundColor(Color.grayee)
+                                            .background(Color.button)
                                             .cornerRadius(6.7)
                                             .padding(.top, 26.7)
                                             .onTapGesture {
@@ -81,6 +81,21 @@ struct MyPageView: View {
                                             }
                                     }
                                     
+                                    HStack(spacing: 8) {
+                                        Text("팔로잉 리스트")
+                                            .frame(maxWidth: .infinity)
+                                            .padding(.vertical, 13.3)
+                                            .font(.custom(Font.bold.rawValue, size: 15.3))
+                                            .foregroundColor(Color.grayee)
+                                            .background(Color.button)
+                                            .cornerRadius(6.7)
+                                            .onTapGesture {
+                                                AppState.shared.setAppStep(step: .followingList)
+                                            }
+                                    }
+                                    .padding(.top, 26.7)
+                                    .padding(.horizontal, 13.3)
+                                    
                                     if UserDefaults.int(forKey: .userId) != 17958 {
                                         CanCardView(data: data) {
                                             viewModel.getMypage()
@@ -149,7 +164,7 @@ struct MyPageView: View {
                         .padding(.vertical, 13.3)
                         .frame(width: geo.size.width - 66.7, alignment: .center)
                         .font(.custom(Font.medium.rawValue, size: 12))
-                        .background(Color(hex: "9970ff"))
+                        .background(Color.button)
                         .foregroundColor(Color.white)
                         .multilineTextAlignment(.center)
                         .cornerRadius(20)