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) }