From 367be742798901bff2a97e4b89cb7364cc0c2810 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Wed, 28 Feb 2024 03:22:42 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EA=B0=9C=EC=88=98=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EB=A3=B0?= =?UTF-8?q?=EB=A0=9B=20=ED=94=84=EB=A6=AC=EC=85=8B=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94/=EB=B9=84=ED=99=9C=EC=84=B1?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Live/Room/Routlette/Config/RouletteSettingsView.swift | 3 +++ .../Room/Routlette/Config/RouletteSettingsViewModel.swift | 2 +- SodaLive/Sources/UI/Component/SelectedButtonView.swift | 7 ++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift index ac8f8d9..39b9f8b 100644 --- a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift +++ b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift @@ -28,6 +28,7 @@ struct RouletteSettingsView: View { HStack(spacing: 13.3) { SelectedButtonView( title: "룰렛 1", + isActive: true, isSelected: viewModel.selectedRoulette == .ROULETTE_1 ) .onTapGesture { @@ -36,6 +37,7 @@ struct RouletteSettingsView: View { SelectedButtonView( title: "룰렛 2", + isActive: viewModel.rouletteList.count > 0, isSelected: viewModel.selectedRoulette == .ROULETTE_2 ) .onTapGesture { @@ -44,6 +46,7 @@ struct RouletteSettingsView: View { SelectedButtonView( title: "룰렛 3", + isActive: viewModel.rouletteList.count > 1, isSelected: viewModel.selectedRoulette == .ROULETTE_3 ) .onTapGesture { diff --git a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift index 80424ef..c714b77 100644 --- a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift +++ b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift @@ -44,7 +44,7 @@ final class RouletteSettingsViewModel: ObservableObject { var can = 0 private var rouletteId = 0 - private var rouletteList = [GetNewRouletteResponse]() + @Published var rouletteList = [GetNewRouletteResponse]() func plusWeight(index: Int) { options[index].weight += 1 diff --git a/SodaLive/Sources/UI/Component/SelectedButtonView.swift b/SodaLive/Sources/UI/Component/SelectedButtonView.swift index bb11357..fd11235 100644 --- a/SodaLive/Sources/UI/Component/SelectedButtonView.swift +++ b/SodaLive/Sources/UI/Component/SelectedButtonView.swift @@ -10,6 +10,7 @@ import SwiftUI struct SelectedButtonView: View { let title: String + let isActive: Bool let isSelected: Bool var body: some View { @@ -20,15 +21,15 @@ struct SelectedButtonView: View { Text(title) .font(.custom(Font.bold.rawValue, size: 14.7)) - .foregroundColor(isSelected ? .white : Color.button) + .foregroundColor(!isActive ? Color.gray77 : isSelected ? .white : Color.button) } .padding(.vertical, 14.3) .frame(maxWidth: .infinity) - .background(isSelected ? Color.button : Color.bg) + .background(!isActive ? Color.gray55 : isSelected ? Color.button : Color.bg) .cornerRadius(6.7) } } #Preview { - SelectedButtonView(title: "테스트", isSelected: true) + SelectedButtonView(title: "테스트", isActive: true, isSelected: true) }