[feat] 회색 말풍선 및 다이얼로그 로직 수정

mash-up-kr · Jan 13, 2024 · 9bc09c3 · 9bc09c3
1 parent 6c78b75
commit 9bc09c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/presenter/src/main/java/com/mashup/twotoo/presenter/home/HomeViewModel.kt b/presenter/src/main/java/com/mashup/twotoo/presenter/home/HomeViewModel.kt
@@ -108,7 +108,9 @@ class HomeViewModel @Inject constructor(
                                 if (isBothBloom(this)) {
                                     postSideEffect(HomeSideEffect.OpenHomeDialog(HomeDialogType.Bloom))
                                 } else {
-                                    postSideEffect(HomeSideEffect.OpenHomeDialog(HomeDialogType.DoNotBloom))
+                                    if (isBothFalse(this)) {
+                                        postSideEffect(HomeSideEffect.OpenHomeDialog(HomeDialogType.DoNotBloom))
+                                    }
                                 }
                             }
                         }
@@ -375,4 +377,10 @@ class HomeViewModel @Inject constructor(
         val partnerProgress = state.homeGoalAchievePartnerAndMeUiModel.partner.progress
         return meProgress >= 0.8f && partnerProgress >= 0.8f
     }
+
+    private fun isBothFalse(state: OngoingChallengeUiModel): Boolean {
+        val meProgress = state.homeGoalAchievePartnerAndMeUiModel.me.progress
+        val partnerProgress = state.homeGoalAchievePartnerAndMeUiModel.partner.progress
+        return meProgress < 0.8f && partnerProgress < 0.8f
+    }
 }
diff --git a/presenter/src/main/res/drawable/ic_cheer_bubble_wrapper.xml b/presenter/src/main/res/drawable/ic_cheer_bubble_wrapper.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="63">
   <path
       android:pathData="M60.73,60C59.96,61.33 58.04,61.33 57.27,60L50.34,48C49.57,46.67 50.53,45 52.07,45H65.93C67.47,45 68.43,46.67 67.66,48L60.73,60Z"
-      android:fillColor="#FFE6AF"/>
+      android:fillColor="#E9E8E8"/>
   <path
       android:pathData="M8.5,0L109.5,0A8,8 0,0 1,117.5 8L117.5,42A8,8 0,0 1,109.5 50L8.5,50A8,8 0,0 1,0.5 42L0.5,8A8,8 0,0 1,8.5 0z"
-      android:fillColor="#FFE6AF"/>
+      android:fillColor="#E9E8E8"/>
 </vector>