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

Jump to bottom

[mod] 마이페이지 / 기간 내 목표를 달성한 경우에 대한 처리 변경 #178

Merged
merged 2 commits into from
Aug 31, 2023
Merged

[mod] 마이페이지 / 기간 내 목표를 달성한 경우에 대한 처리 변경 #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcd15e5
[del] 사용하지 않는 yml 파일 삭제
leeeha Aug 31, 2023
ed109c0
[mod] 기간 내 목표를 달성한 순간에는 절약 목표, 기간, 금액, 횟수 모두 유지되도록 변경
leeeha Aug 31, 2023
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
29 changes: 0 additions & 29 deletions .github/workflows/release_tag_generator.yml
View file
Open in desktop

This file was deleted.

69 changes: 27 additions & 42 deletions app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,75 +187,44 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
private fun setupGetUserState() {
mainViewModel.getUserState.flowWithLifecycle(lifecycle).onEach { state ->
when (state) {
is UiState.Loading -> {
}

is UiState.Success -> {
val data = dataStoreRepository.getUserInfo().first()
val data = dataStoreRepository.getUserInfo().first() ?: return@onEach
updateUserInfo(data)
initBottomSheetClickListener(data)
initTargetModifyButtonClickListener(data)
}

is UiState.Failure -> {
snackBar(binding.root) { state.msg }
}

is UiState.Empty -> {
}
else -> {}
}
}.launchIn(lifecycleScope)
}

private fun initBottomSheetClickListener(data: User?) {
binding.clMypageTargetmoney.setOnSingleClickListener {
amplitudeUtils.logEvent("click_goalsetting")

when (data?.isOver) {
true -> {
val bottomSheet = TargetAmountBottomSheetFragment()
bottomSheet.show(this.childFragmentManager, bottomSheet.tag)
amplitudeUtils.logEvent("view_goalsetting")
}

false -> {
val dialog = MyPageDialogFragment()
dialog.show(this.childFragmentManager, dialog.tag)
}

null -> {
}
}
}
}

private fun updateUserInfo(data: User?) {
private fun updateUserInfo(data: User) {
binding.data = data

// todo: 기간 내 목표 달성하면 누적위니, 위니횟수도 0으로 초기화 되도록

handleIsOver(data)
handleUserLevel(data)
updateTargetInfo(data)
updateUserLevel(data)
}

private fun handleIsOver(data: User?) {
if (data == null) return

private fun updateTargetInfo(data: User) {
// 목표를 설정한 적이 없는 경우 (초기 상태)
if (data.isOver) {
binding.tvMypageTargetAmount.text = getString(R.string.mypage_not_yet_set)
binding.tvMypagePeriodValue.text = getString(R.string.mypage_not_yet_set)
} else {
binding.targetMoney = data
if (data.dday == 0) {
binding.tvMypagePeriodValue.text = getString(R.string.mypage_d_day)
binding.targetMoney = data
} else {
binding.targetMoney = data
binding.dday = data
}
}
}

private fun handleUserLevel(data: User?) {
when (data?.userLevel) {
private fun updateUserLevel(data: User) {
when (data.userLevel) {
LEVEL_COMMON -> {
binding.ivMypageProgressbar.setImageResource(R.drawable.ic_mypage_lv1_progressbar)
binding.ivMypageProfile.setImageResource(R.drawable.ic_mypage_lv1_profile)
Expand All @@ -278,6 +247,22 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
}
}

private fun initTargetModifyButtonClickListener(user: User) {
binding.clMypageTargetmoney.setOnSingleClickListener {
amplitudeUtils.logEvent("click_goalsetting")

// 목표를 설정한 적 없거나, 기간이 종료되었거나, 기간 내 목표를 달성한 경우
if (user.isOver || user.isAttained) {
val bottomSheet = TargetAmountBottomSheetFragment()
bottomSheet.show(parentFragmentManager, bottomSheet.tag)
amplitudeUtils.logEvent("view_goalsetting")
} else {
val dialog = MyPageNotOverDialogFragment()
dialog.show(parentFragmentManager, dialog.tag)
}
}
}

private inline fun <reified T : Fragment> navigateAndBackStack() {
parentFragmentManager.commit {
replace<T>(R.id.fcv_main, T::class.simpleName)
Expand Down
2 changes: 1 addition & 1 deletion ...ation/main/mypage/MyPageDialogFragment.kt → ...ain/mypage/MyPageNotOverDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.go.sopt.winey.R
import com.go.sopt.winey.databinding.FragmentMypageNotOverDialogBinding
import com.go.sopt.winey.util.binding.BindingDialogFragment

class MyPageDialogFragment :
class MyPageNotOverDialogFragment :
BindingDialogFragment<FragmentMypageNotOverDialogBinding>(R.layout.fragment_mypage_not_over_dialog) {

override fun onCreate(savedInstanceState: Bundle?) {
Expand Down