From e34a17277939154e2c28b0128d834ad0f72457be Mon Sep 17 00:00:00 2001
From: Yu Sung <hwchon1234@gmail.com>
Date: Tue, 24 Sep 2024 21:54:47 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=B0=A9=20-=20?=
 =?UTF-8?q?=EC=8A=A4=ED=94=BC=EC=BB=A4=20=EC=88=98=EA=B0=80=20=EC=A6=9D?=
 =?UTF-8?q?=EA=B0=80=ED=95=A8=EC=97=90=20=EB=94=B0=EB=9D=BC=20UI=EA=B0=80?=
 =?UTF-8?q?=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20=EB=84=98=EC=B9=98?=
 =?UTF-8?q?=EB=8D=98=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/LiveRoomInfoCreatorView.swift        |  7 ++-
 .../View/LiveRoomInfoGuestView.swift          | 57 ++++++++---------
 .../Component/View/LiveRoomInfoHostView.swift | 61 ++++++++-----------
 .../View/LiveRoomInfoSpeakerView.swift        | 23 ++++---
 4 files changed, 64 insertions(+), 84 deletions(-)

diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift
index d1879c8..aeb0c08 100644
--- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift
+++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift
@@ -67,6 +67,7 @@ struct LiveRoomInfoCreatorView: View {
                     Text(creatorNickname)
                         .font(.custom(Font.medium.rawValue, size: 12))
                         .foregroundColor(.gray77)
+                        .lineLimit(1)
                     
                     if isShowFollowingButton {
                         Image(isFollowing ? "btn_following" : "btn_follow")
@@ -75,8 +76,8 @@ struct LiveRoomInfoCreatorView: View {
                 }
             }
         }
-        .padding(.vertical, 8)
-        .padding(.horizontal, 5.3)
+        .padding(8)
+        .frame(width: screenSize().width / 2.5, alignment: .leading)
         .overlay(
             RoundedRectangle(cornerRadius: 5.3)
                 .stroke(Color.graybb, lineWidth: 1)
@@ -87,7 +88,7 @@ struct LiveRoomInfoCreatorView: View {
 struct LiveRoomInfoCreatorView_Previews: PreviewProvider {
     static var previews: some View {
         LiveRoomInfoCreatorView(
-            roomTitle: "오늘 라이브방송은 OOO 입니다.",
+            roomTitle: "qwer",
             creatorNickname: "도화",
             creatorProfileUrl: "https://cf.sodalive.net/profile/26/26-profile-ddf78b4d-0300-4c50-9c84-5d8a95fd5fe2-4892-1705256364320",
             isMute: false,
diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift
index c82530c..3bd6158 100644
--- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift
+++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoGuestView.swift
@@ -108,23 +108,28 @@ struct LiveRoomInfoGuestView: View {
                         onClickFollow: { onClickFollow(isFollowing) },
                         onClickProfile: { onClickProfile(creatorId) }
                     )
-                    .frame(width: 180, alignment: .leading)
                     
                     Spacer()
                     
-                    ForEach(0..<speakerList.count, id: \.self) { index in
-                        let speaker = speakerList[index]
-                        
-                        if speaker.id != UInt(creatorId) {
-                            LiveRoomInfoSpeakerView(
-                                nickname: speaker.nickname,
-                                profileUrl: speaker.profileImage,
-                                isMute: muteSpeakerList.contains(UInt(speaker.id)),
-                                isActiveSpeaker: activeSpeakerList.contains(UInt(speaker.id)),
-                                onClickProfile: { onClickProfile(speaker.id) }
-                            )
+                    ScrollView(.horizontal, showsIndicators: false) {
+                        HStack(spacing: 8) {
+                            ForEach(0..<speakerList.count, id: \.self) { index in
+                                let speaker = speakerList[index]
+                                
+                                if speaker.id != UInt(creatorId) {
+                                    LiveRoomInfoSpeakerView(
+                                        nickname: speaker.nickname,
+                                        profileUrl: speaker.profileImage,
+                                        isMute: muteSpeakerList.contains(UInt(speaker.id)),
+                                        isActiveSpeaker: activeSpeakerList.contains(UInt(speaker.id)),
+                                        onClickProfile: { onClickProfile(speaker.id) }
+                                    )
+                                }
+                            }
                         }
+                        .rotationEffect(Angle(degrees: 180))
                     }
+                    .rotationEffect(Angle(degrees: 180))
                 }
                 
                 HStack(spacing: 5.3) {
@@ -184,13 +189,19 @@ struct LiveRoomInfoGuestView: View {
         .padding(.horizontal, 13.3)
         .padding(.top, 16)
         .background(Color.gray22)
+        .onAppear {
+            UIScrollView.appearance().bounces = false
+        }
+        .onDisappear {
+            UIScrollView.appearance().bounces = true
+        }
     }
 }
 
 struct LiveRoomInfoGuestView_Previews: PreviewProvider {
     static var previews: some View {
         LiveRoomInfoGuestView(
-            title: "오늘의 라이브방송은 OOO입니다.",
+            title: "qwer",
             totalDonationCan: 123456,
             isOnBg: true,
             isOnNotice: false,
@@ -218,25 +229,7 @@ struct LiveRoomInfoGuestView_Previews: PreviewProvider {
                     nickname: "LUNA",
                     profileImage: "https://cf.sodalive.net/profile/4679/4679-profile-41e83399-234e-4541-8591-f961a025cfaa-5819-1699536915310",
                     role: .SPEAKER
-                ),
-                LiveRoomMember(
-                    id: 4,
-                    nickname: "도화",
-                    profileImage: "https://cf.sodalive.net/profile/26/26-profile-ddf78b4d-0300-4c50-9c84-5d8a95fd5fe2-4892-1705256364320",
-                    role: .SPEAKER
-                ),
-                LiveRoomMember(
-                    id: 5,
-                    nickname: "도화",
-                    profileImage: "https://cf.sodalive.net/profile/26/26-profile-ddf78b4d-0300-4c50-9c84-5d8a95fd5fe2-4892-1705256364320",
-                    role: .SPEAKER
-                ),
-                LiveRoomMember(
-                    id: 6,
-                    nickname: "도화",
-                    profileImage: "https://cf.sodalive.net/profile/26/26-profile-ddf78b4d-0300-4c50-9c84-5d8a95fd5fe2-4892-1705256364320",
-                    role: .SPEAKER
-                ),
+                )
             ],
             muteSpeakerList: [],
             activeSpeakerList: [],
diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift
index 18846b1..ac8846e 100644
--- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift
+++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoHostView.swift
@@ -106,23 +106,28 @@ struct LiveRoomInfoHostView: View {
                         onClickFollow: {},
                         onClickProfile: {}
                     )
-                    .frame(width: 180, alignment: .leading)
                     
                     Spacer()
                     
-                    ForEach(0..<speakerList.count, id: \.self) { index in
-                        let speaker = speakerList[index]
-                        
-                        if speaker.id != UInt(creatorId) {
-                            LiveRoomInfoSpeakerView(
-                                nickname: speaker.nickname,
-                                profileUrl: speaker.profileImage,
-                                isMute: muteSpeakerList.contains(UInt(speaker.id)),
-                                isActiveSpeaker: activeSpeakerList.contains(UInt(speaker.id)),
-                                onClickProfile: { onClickProfile(speaker.id) }
-                            )
+                    ScrollView(.horizontal, showsIndicators: false) {
+                        HStack(spacing: 8) {
+                            ForEach(0..<speakerList.count, id: \.self) { index in
+                                let speaker = speakerList[index]
+                                
+                                if speaker.id != UInt(creatorId) {
+                                    LiveRoomInfoSpeakerView(
+                                        nickname: speaker.nickname,
+                                        profileUrl: speaker.profileImage,
+                                        isMute: muteSpeakerList.contains(UInt(speaker.id)),
+                                        isActiveSpeaker: activeSpeakerList.contains(UInt(speaker.id)),
+                                        onClickProfile: { onClickProfile(speaker.id) }
+                                    )
+                                }
+                            }
                         }
+                        .rotationEffect(Angle(degrees: 180))
                     }
+                    .rotationEffect(Angle(degrees: 180))
                 }
                 
                 HStack(spacing: 5.3) {
@@ -199,6 +204,12 @@ struct LiveRoomInfoHostView: View {
         .padding(.horizontal, 13.3)
         .padding(.top, 16)
         .background(Color.gray22)
+        .onAppear {
+            UIScrollView.appearance().bounces = false
+        }
+        .onDisappear {
+            UIScrollView.appearance().bounces = true
+        }
     }
 }
 
@@ -228,31 +239,7 @@ struct LiveRoomInfoHostView_Previews: PreviewProvider {
                     nickname: "청령",
                     profileImage: "https://cf.sodalive.net/profile/13/13-profile-fabb75e0-2870-4d99-900e-1d9aa63e605b-685-1704859996417",
                     role: .SPEAKER
-                ),
-                LiveRoomMember(
-                    id: 3,
-                    nickname: "LUNA",
-                    profileImage: "https://cf.sodalive.net/profile/4679/4679-profile-41e83399-234e-4541-8591-f961a025cfaa-5819-1699536915310",
-                    role: .SPEAKER
-                ),
-                LiveRoomMember(
-                    id: 4,
-                    nickname: "도화",
-                    profileImage: "https://cf.sodalive.net/profile/26/26-profile-ddf78b4d-0300-4c50-9c84-5d8a95fd5fe2-4892-1705256364320",
-                    role: .SPEAKER
-                ),
-                LiveRoomMember(
-                    id: 5,
-                    nickname: "도화",
-                    profileImage: "https://cf.sodalive.net/profile/26/26-profile-ddf78b4d-0300-4c50-9c84-5d8a95fd5fe2-4892-1705256364320",
-                    role: .SPEAKER
-                ),
-                LiveRoomMember(
-                    id: 6,
-                    nickname: "도화",
-                    profileImage: "https://cf.sodalive.net/profile/26/26-profile-ddf78b4d-0300-4c50-9c84-5d8a95fd5fe2-4892-1705256364320",
-                    role: .SPEAKER
-                ),
+                )
             ],
             muteSpeakerList: [],
             activeSpeakerList: [],
diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift
index 6f0cac1..1d59515 100644
--- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift
+++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoSpeakerView.swift
@@ -19,32 +19,31 @@ struct LiveRoomInfoSpeakerView: View {
     let onClickProfile: () -> Void
     
     var body: some View {
-        VStack(spacing: 2.7) {
+        VStack(spacing: 5) {
             ZStack(alignment: .center) {
                 KFImage(URL(string: profileUrl))
                     .resizable()
-                    .frame(width: 26.7, height: 26.7)
+                    .frame(width: 25, height: 25)
                     .clipShape(Circle())
-                    .overlay(
-                        Circle()
-                            .stroke(
-                                Color.button,
-                                lineWidth: isActiveSpeaker ? 3 : 0
-                            )
-                    )
                 
                 if isMute {
                     Image("ic_mute")
                         .resizable()
-                        .frame(width: 30, height: 30)
+                        .frame(width: 25, height: 25)
                 }
             }
+            .overlay(
+                Circle()
+                    .stroke(
+                        Color.button,
+                        lineWidth: isActiveSpeaker ? 3 : 0
+                    )
+            )
             
             Text(nickname)
-                .font(.custom(Font.medium.rawValue, fixedSize: 10.7))
+                .font(.custom(Font.medium.rawValue, fixedSize: 8.7))
                 .foregroundColor(.gray77)
         }
-        .frame(width: 30, height: 30)
         .onTapGesture { onClickProfile() }
     }
 }