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 index 6fd13b81..4239a3d6 100644 --- 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 index 3fed67cf..bb4647b7 100644 --- 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"> + android:fillColor="#E9E8E8"/> + android:fillColor="#E9E8E8"/>