From 2d0c4ea7387e902d28d989f8a542d345b8a34038 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 28 Feb 2024 03:56:51 +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 --- .../config/RouletteSettingsFragment.kt | 45 +++++++++++++------ .../config/RouletteSettingsViewModel.kt | 2 +- .../drawable/bg_round_corner_6_7_777777.xml | 8 ++++ .../res/layout/fragment_roulette_settings.xml | 8 ++-- 4 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_777777.xml diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteSettingsFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteSettingsFragment.kt index ff59a44..ecdc7bb 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteSettingsFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/roulette/config/RouletteSettingsFragment.kt @@ -236,9 +236,6 @@ class RouletteSettingsFragment : BaseFragment( binding.ivSelectRoulette3.visibility = View.GONE binding.llSelectRoulette1.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) - binding.llSelectRoulette2.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) - binding.llSelectRoulette3.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) - binding.tvSelectRoulette1.setTextColor( ContextCompat.getColor( requireContext(), @@ -246,19 +243,41 @@ class RouletteSettingsFragment : BaseFragment( ) ) - binding.tvSelectRoulette2.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.color_3bb9f1 + if (viewModel.rouletteList.size > 0) { + binding.llSelectRoulette2.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) + binding.tvSelectRoulette2.setTextColor( + ContextCompat.getColor( + requireContext(), + R.color.color_3bb9f1 + ) ) - ) + } else { + binding.llSelectRoulette2.setBackgroundResource(R.drawable.bg_round_corner_6_7_777777) + binding.tvSelectRoulette2.setTextColor( + ContextCompat.getColor( + requireContext(), + R.color.color_555555 + ) + ) + } - binding.tvSelectRoulette3.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.color_3bb9f1 + if (viewModel.rouletteList.size > 1) { + binding.llSelectRoulette3.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) + binding.tvSelectRoulette3.setTextColor( + ContextCompat.getColor( + requireContext(), + R.color.color_3bb9f1 + ) ) - ) + } else { + binding.llSelectRoulette3.setBackgroundResource(R.drawable.bg_round_corner_6_7_777777) + binding.tvSelectRoulette3.setTextColor( + ContextCompat.getColor( + requireContext(), + R.color.color_555555 + ) + ) + } } private fun selectRouletteButton( 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 42f9878..4eeba6a 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 @@ -53,7 +53,7 @@ class RouletteSettingsViewModel(private val repository: RouletteRepository) : Ba private var rouletteId = 0L private val options = mutableListOf() - private val rouletteList = mutableListOf() + val rouletteList = mutableListOf() fun plusWeight(optionIndex: Int) { val currentOption = options[optionIndex] diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_777777.xml b/app/src/main/res/drawable/bg_round_corner_6_7_777777.xml new file mode 100644 index 0000000..27ec067 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_6_7_777777.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_roulette_settings.xml b/app/src/main/res/layout/fragment_roulette_settings.xml index 1e24013..b00d1a2 100644 --- a/app/src/main/res/layout/fragment_roulette_settings.xml +++ b/app/src/main/res/layout/fragment_roulette_settings.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_13181b" + android:background="@drawable/bg_round_corner_6_7_777777" android:gravity="center" android:paddingVertical="14.3dp"> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="룰렛 2" - android:textColor="@color/color_3bb9f1" + android:textColor="@color/color_555555" android:textSize="14.7sp" /> @@ -89,7 +89,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_13181b" + android:background="@drawable/bg_round_corner_6_7_777777" android:gravity="center" android:paddingVertical="14.3dp"> @@ -108,7 +108,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="룰렛 3" - android:textColor="@color/color_3bb9f1" + android:textColor="@color/color_555555" android:textSize="14.7sp" />