From 1b8ac1f27d90c59c6d50512cda924cc48d9c7fb9 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Sun, 27 Oct 2024 21:23:03 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=B0=A9=20-=20?= =?UTF-8?q?=EC=B1=84=ED=8C=85=EC=B0=BD=20=EB=84=88=EB=B9=84=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EA=B0=80=EB=93=9D=20=EC=B1=84=EC=9B=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Live/Room/V2/LiveRoomViewV2.swift | 85 +++++++++---------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift b/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift index 323f6f7..cd59726 100644 --- a/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift +++ b/SodaLive/Sources/Live/Room/V2/LiveRoomViewV2.swift @@ -195,57 +195,54 @@ struct LiveRoomViewV2: View { } } - HStack(alignment: .bottom, spacing: 0) { - LiveRoomInputChatView { - viewModel.sendMessage(chatMessage: $0) { - viewModel.isShowingNewChat = false - proxy.scrollTo(viewModel.messages.count - 1, anchor: .center) - } - - return true - } - - VStack(spacing: 13.3) { - if liveRoomInfo.creatorId == UserDefaults.int(forKey: .userId) { - LiveRoomRightBottomButton( - imageName: "ic_roulette_settings", - onClick: { viewModel.isShowRouletteSettings = true } - ) - } else { - LiveRoomRightBottomButton( - imageName: "ic_heart_pink", - onClick: { viewModel.likeHeart() } - ) - - if viewModel.isActiveRoulette { - LiveRoomRightBottomButton( - imageName: "ic_roulette", - onClick: { viewModel.showRoulette() } - ) - } - } - + VStack(spacing: 13.3) { + if liveRoomInfo.creatorId == UserDefaults.int(forKey: .userId) { LiveRoomRightBottomButton( - imageName: "ic_donation_message_list", - onClick: { viewModel.isShowDonationMessagePopup = true } + imageName: "ic_roulette_settings", + onClick: { viewModel.isShowRouletteSettings = true } + ) + } else { + LiveRoomRightBottomButton( + imageName: "ic_heart_pink", + onClick: { viewModel.likeHeart() } ) - if liveRoomInfo.creatorId != UserDefaults.int(forKey: .userId) { + if viewModel.isActiveRoulette { LiveRoomRightBottomButton( - imageName: "ic_donation", - onClick: { viewModel.isShowDonationPopup = true } - ) - } - - if viewModel.role == .SPEAKER { - LiveRoomRightBottomButton( - imageName: viewModel.isMute ? "ic_mic_off" : "ic_mic_on", - onClick: { viewModel.toggleMute() } + imageName: "ic_roulette", + onClick: { viewModel.showRoulette() } ) } } - .padding(.bottom, 13.3) - .padding(.trailing, 13.3) + + LiveRoomRightBottomButton( + imageName: "ic_donation_message_list", + onClick: { viewModel.isShowDonationMessagePopup = true } + ) + + if liveRoomInfo.creatorId != UserDefaults.int(forKey: .userId) { + LiveRoomRightBottomButton( + imageName: "ic_donation", + onClick: { viewModel.isShowDonationPopup = true } + ) + } + + if viewModel.role == .SPEAKER { + LiveRoomRightBottomButton( + imageName: viewModel.isMute ? "ic_mic_off" : "ic_mic_on", + onClick: { viewModel.toggleMute() } + ) + } + } + .padding(.trailing, 13.3) + + LiveRoomInputChatView { + viewModel.sendMessage(chatMessage: $0) { + viewModel.isShowingNewChat = false + proxy.scrollTo(viewModel.messages.count - 1, anchor: .center) + } + + return true } .padding(.bottom, 10) }