#160[fix] NONE을 살리고 equals로 비교

Team-Sopetit · Feb 7, 2024 · d7b0701 · d7b0701
1 parent 5e4abb7
commit d7b0701
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/OnboardingViewModel.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/OnboardingViewModel.kt
@@ -115,7 +115,7 @@ class OnboardingViewModel @Inject constructor(
     }
 
     companion object {
-        const val NONE = ""
+        const val NONE = "NONE"
         const val BROWN = "BROWN"
         const val GRAY = "GRAY"
         const val WHITE = "WHITE"

diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/bearselection/BearSelectionViewModel.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/bearselection/BearSelectionViewModel.kt
@@ -14,19 +14,12 @@ class BearSelectionViewModel @Inject constructor(
 ) : ViewModel() {
     private val _selectedBearType: MutableLiveData<String> = MutableLiveData(NONE)
     val selectedBearType: LiveData<String> get() = _selectedBearType
-    private val _isBearSelected: MutableLiveData<Boolean> = MutableLiveData(false)
-    val isBearSelected: LiveData<Boolean> get() = _isBearSelected
 
     fun selectBearType(dollType: String) {
         val isSameBearSelected = _selectedBearType.value == dollType
 
-        if (isSameBearSelected) {
-            _selectedBearType.value = NONE
-            _isBearSelected.value = false
-        } else {
-            _selectedBearType.value = dollType
-            _isBearSelected.value = true
-        }
+        if (isSameBearSelected) _selectedBearType.value = NONE
+        else _selectedBearType.value = dollType
     }
 
     fun setBearType() {

diff --git a/app/src/main/res/layout/fragment_onboarding_bear_selection.xml b/app/src/main/res/layout/fragment_onboarding_bear_selection.xml
@@ -100,9 +100,9 @@
             android:layout_marginHorizontal="20dp"
             android:layout_marginBottom="34dp"
             style="?android:attr/borderlessButtonStyle"
-            android:background="@{viewModel.isBearSelected ? @drawable/shape_main1_fill_12_rect: @drawable/shape_gray200_fill_12_rect}"
-            android:clickable="@{viewModel.isBearSelected ? true: false}"
-            android:enabled="@{viewModel.isBearSelected ? true: false}"
+            android:background="@{viewModel.selectedBearType.equals(@string/none) ? @drawable/shape_gray200_fill_12_rect:@drawable/shape_main1_fill_12_rect}"
+            android:clickable="@{viewModel.selectedBearType.equals(@string/none) ? false: true}"
+            android:enabled="@{viewModel.selectedBearType.equals(@string/none) ? false: true}"
             android:text="@string/bear_selection_button"
             android:textAppearance="@style/body1"
             android:textColor="@color/gray000"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="red">RED</string>
     <string name="white">WHITE</string>
     <string name="gray">GRAY</string>
+    <string name="none">NONE</string>
 
     <!-- util -->
     <string name="finish_app_toast_msg">뒤로가기를 한 번 더 누르면 종료됩니다</string>