Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 13, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion presenter/src/main/java/com/mashup/twotoo/presenter/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
}
}
Expand Down Expand Up @@ -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
}
}
4 changes: 2 additions & 2 deletions presenter/src/main/res/drawable/ic_cheer_bubble_wrapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>