diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteSettingsViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteSettingsViewModel.kt index 14ccb49..42f9878 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteSettingsViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteSettingsViewModel.kt @@ -169,8 +169,25 @@ class RouletteSettingsViewModel(private val repository: RouletteRepository) : Ba SelectedRoulette.ROULETTE_3 -> "룰렛 3" } - val successMessage = "${selectedRouletteTitle}을 " + - "${if (isActive) "활성화" else "비활성화"} 했습니다." + var isAllActive = false + + rouletteList + .filter { + it.id != selectedRoulette.id + } + .forEach { + if (it.isActive) { + isAllActive = true + } + } + + val successMessage = if (isActive) { + "${selectedRouletteTitle}로 설정하였습니다." + } else if (!isAllActive) { + "${selectedRouletteTitle}이 비활성화 되었습니다." + } else { + "${selectedRouletteTitle}을 설정했습니다." + } compositeDisposable.add( repository.updateRoulette( @@ -228,8 +245,8 @@ class RouletteSettingsViewModel(private val repository: RouletteRepository) : Ba SelectedRoulette.ROULETTE_3 -> "룰렛 3" } - val successMessage = "${selectedRouletteTitle}을 " + - "${if (isActive) "활성화" else "비활성화"} 했습니다." + val successMessage = "$selectedRouletteTitle " + + if (isActive) "로 설정하였습니다." else "을 설정했습니다." compositeDisposable.add( repository.createRoulette( @@ -309,12 +326,12 @@ class RouletteSettingsViewModel(private val repository: RouletteRepository) : Ba selectedRoulette == SelectedRoulette.ROULETTE_3 ) ) { - _toastLiveData.value = "룰렛 1만 선택 가능" + _toastLiveData.value = "룰렛 1을 먼저 설정하세요" return } if (rouletteList.size == 1 && selectedRoulette == SelectedRoulette.ROULETTE_3) { - _toastLiveData.value = "룰렛 1, 룰렛 2만 선택 가능" + _toastLiveData.value = "룰렛 1과 룰렛 2를 먼저 설정하세요" return }