[AN] 마이페이지 수정 및 보기 기능 개선 #602
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,46 @@ | ||
| package com.created.team201.presentation.myPage | ||
|
|
||
| import android.content.res.ColorStateList | ||
| import android.os.Bundle | ||
| import android.util.TypedValue | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import android.widget.EditText | ||
| import android.widget.GridLayout | ||
| import android.widget.ImageView | ||
| import android.widget.Toast | ||
| import androidx.core.content.ContextCompat | ||
| import androidx.core.view.forEach | ||
| import androidx.core.view.setMargins | ||
| import androidx.core.widget.doOnTextChanged | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.commit | ||
| import androidx.fragment.app.viewModels | ||
| import com.bumptech.glide.Glide | ||
| import com.created.team201.R | ||
| import com.created.team201.databinding.FragmentMyPageBinding | ||
| import com.created.team201.presentation.myPage.MyPageViewModel.Event.EnableModify | ||
| import com.created.team201.presentation.myPage.MyPageViewModel.Event.ModifyMyPage | ||
| import com.created.team201.presentation.myPage.MyPageViewModel.Event.ShowDialog | ||
| import com.created.team201.presentation.myPage.MyPageViewModel.Event.ShowToast | ||
| import com.created.team201.presentation.myPage.MyPageViewModel.State.Fail | ||
| import com.created.team201.presentation.myPage.MyPageViewModel.State.Loading | ||
| import com.created.team201.presentation.myPage.MyPageViewModel.State.Success | ||
| import com.created.team201.presentation.myPage.model.ProfileType | ||
| import com.created.team201.presentation.myPage.model.TierProgress | ||
| import com.created.team201.presentation.setting.SettingActivity | ||
| import com.created.team201.presentation.studyDetail.model.Tier | ||
| import com.created.team201.util.FirebaseLogUtil | ||
| import com.created.team201.util.FirebaseLogUtil.SCREEN_MY_PAGE | ||
| import com.created.team201.util.collectOnStarted | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
|
|
||
| @AndroidEntryPoint | ||
| class MyPageFragment : Fragment() { | ||
| private val myPageViewModel: MyPageViewModel by viewModels() | ||
| private var _binding: FragmentMyPageBinding? = null | ||
| private val binding: FragmentMyPageBinding get() = _binding!! | ||
|
There was a problem hiding this comment. 오래동안 안써서 까먹을 법도 한데 세심하게 잘 처리해주셨네요! |
||
|
|
||
| override fun onHiddenChanged(hidden: Boolean) { | ||
| super.onHiddenChanged(hidden) | ||
|
|
@@ -43,21 +57,39 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_ | |
| FirebaseLogUtil.logScreenEvent(SCREEN_MY_PAGE, [email protected]) | ||
| } | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View { | ||
| _binding = FragmentMyPageBinding.inflate(layoutInflater) | ||
| return binding.root | ||
| } | ||
|
|
||
| override fun onDestroyView() { | ||
| super.onDestroyView() | ||
|
|
||
| _binding = null | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| initMyProfile() | ||
| setActionBar() | ||
| setOnProfileModifyClick() | ||
| setEditTextChangeListener() | ||
| collectMyProfileInformation() | ||
| collectMyProfileType() | ||
| collectModifyProfileState() | ||
| collectNicknameState() | ||
| collectMyProfile() | ||
| collectMyPageEvent() | ||
| } | ||
|
|
||
| private fun initMyProfile() { | ||
| myPageViewModel.loadProfile() | ||
| myPageViewModel.setProfileType(ProfileType.VIEW) | ||
| } | ||
|
|
||
| private fun setActionBar() { | ||
|
|
@@ -77,58 +109,167 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_ | |
| startActivity(SettingActivity.getIntent(requireContext())) | ||
| } | ||
|
|
||
| private fun setOnProfileModifyClick() { | ||
| binding.tvMyPageBtnModifyProfile.setOnClickListener { | ||
| when (myPageViewModel.profileType.value) { | ||
| ProfileType.VIEW -> { | ||
| myPageViewModel.switchProfileType() | ||
| } | ||
|
|
||
| ProfileType.MODIFY -> { | ||
| myPageViewModel.changeMyPageEvent(ShowDialog) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun setProfileView(enabled: Boolean) { | ||
| setNicknameReadWriteMode(enabled) | ||
| setIntroductionReadWriteMode(enabled) | ||
| binding.etMyPageProfileNickname.requestFocus(View.FOCUS_UP) | ||
| binding.tvMyPageNicknameValidateIntroduction.visibility = | ||
| if (enabled) View.VISIBLE else View.GONE | ||
| binding.tbMyPage.menu.forEach { item -> | ||
| item.isVisible = !enabled | ||
| } | ||
| binding.tvMyPageBtnModifyProfile.text = | ||
| if (enabled) getString(R.string.myPage_button_save_profile) else getString(R.string.myPage_button_modify_profile) | ||
| } | ||
|
|
||
| private fun setNicknameReadWriteMode(enabled: Boolean) { | ||
| with(binding.etMyPageProfileNickname) { | ||
| isEnabled = enabled | ||
| when (enabled) { | ||
| true -> { | ||
| backgroundTintList = | ||
| ColorStateList.valueOf(requireContext().getColor(R.color.green02_E639D353)) | ||
| setCompoundDrawablesWithIntrinsicBounds( | ||
| null, | ||
| null, | ||
| ContextCompat.getDrawable(requireContext(), R.drawable.ic_edit_16), | ||
| null, | ||
| ) | ||
| } | ||
|
|
||
| false -> { | ||
| backgroundTintList = | ||
| ColorStateList.valueOf(requireContext().getColor(R.color.transparent)) | ||
| setCompoundDrawables(null, null, null, null) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun setIntroductionReadWriteMode(enabled: Boolean) { | ||
| with(binding.etMyPageProfileIntroduction) { | ||
| when (enabled) { | ||
| true -> { | ||
| background = ContextCompat.getDrawable(requireContext(), R.drawable.bg_stroke_fill_color_5dp) | ||
| linksClickable = enabled.not() | ||
| isCursorVisible = enabled | ||
| keyListener = EditText(requireContext()).keyListener | ||
| } | ||
|
|
||
| false -> { | ||
| background = ContextCompat.getDrawable(requireContext(), R.drawable.bg_rectangle_radius_5dp) | ||
| linksClickable = enabled.not() | ||
| isCursorVisible = enabled | ||
| keyListener = null | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun setEditTextChangeListener() { | ||
| binding.etMyPageProfileNickname.filters = myPageViewModel.getInputFilter() | ||
| binding.etMyPageProfileNickname.doOnTextChanged { text, start, before, count -> | ||
| myPageViewModel.setNickname(text.toString()) | ||
| } | ||
| binding.etMyPageProfileIntroduction.doOnTextChanged { text, _, _, _ -> | ||
| myPageViewModel.setIntroduction(text.toString()) | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. 함수 파라미터가 없기 때문에 prefix를 set 대신 setup으로 변경하시는게 좋을 것 같네요 |
||
|
|
||
| private fun collectMyProfileInformation() { | ||
| myPageViewModel.nickname.collectOnStarted(viewLifecycleOwner) { nickname -> | ||
| if (binding.etMyPageProfileNickname.text.toString() == nickname) return@collectOnStarted | ||
| binding.etMyPageProfileNickname.setText(nickname) | ||
| } | ||
|
|
||
| myPageViewModel.introduction.collectOnStarted(viewLifecycleOwner) { introduction -> | ||
| if (binding.etMyPageProfileIntroduction.text.toString() == introduction) return@collectOnStarted | ||
| binding.etMyPageProfileIntroduction.setText(introduction) | ||
| } | ||
| } | ||
|
|
||
| private fun collectMyProfileType() { | ||
| myPageViewModel.profileType.collectOnStarted(viewLifecycleOwner) { profileType -> | ||
| when (profileType) { | ||
| ProfileType.VIEW -> setProfileView(false) | ||
| ProfileType.MODIFY -> setProfileView(true) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun collectModifyProfileState() { | ||
|
|
||
| myPageViewModel.modifyProfileState.collectOnStarted(viewLifecycleOwner) { modifyProfileState -> | ||
| when (modifyProfileState) { | ||
| Loading -> Unit | ||
| Success -> { | ||
| myPageViewModel.changeMyPageEvent( | ||
| ShowToast(getString(R.string.myPage_toast_modify_profile_success)) | ||
| ) | ||
| } | ||
|
|
||
| Fail -> { | ||
| myPageViewModel.changeMyPageEvent( | ||
| ShowToast(getString(R.string.myPage_toast_modify_profile_failed)) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun collectNicknameState() { | ||
| myPageViewModel.nicknameState.collectOnStarted(viewLifecycleOwner) { state -> | ||
| with(binding.tvMyPageNicknameValidateIntroduction) { | ||
| text = getString(state.introduction) | ||
| setTextColor(requireContext().getColor(state.color)) | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
| private fun collectMyProfile() { | ||
| myPageViewModel.profile.collectOnStarted(viewLifecycleOwner) { profile -> | ||
| binding.ivMyPageProfile.loadImageUrl(profile.profileImageUrl) | ||
| binding.tvMyPageProfileId.text = profile.githubId | ||
| binding.etMyPageProfileNickname.setText(profile.profileInformation.nickname.nickname) | ||
| binding.etMyPageProfileIntroduction.setText(profile.profileInformation.introduction) | ||
| binding.layoutMyPageStudySuccessRate.result = | ||
| getString(R.string.profile_success_rate_format, profile.successRate) | ||
| binding.layoutMyPageTodoSuccessRate.result = | ||
| getString(R.string.profile_todo_success_rate_format, profile.successfulRoundCount) | ||
| setupTierProgress( | ||
| TierProgress.of( | ||
| Tier.of(profile.tier), | ||
| profile.tierProgress, | ||
| ).getTierProgressTable(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun ImageView.loadImageUrl(imageUrl: String?) { | ||
| Glide.with(requireContext()) | ||
| .load(imageUrl) | ||
| .into(this) | ||
| } | ||
|
|
||
| private fun collectMyPageEvent() { | ||
| myPageViewModel.myPageEvent.collectOnStarted(viewLifecycleOwner) { event -> | ||
| when (event) { | ||
| is ShowToast -> showToast(event.message) | ||
| ShowDialog -> { | ||
| removeDialog() | ||
| showDialog( | ||
| getString(R.string.myPage_dialog_modify_profile_title), | ||
|
|
@@ -137,40 +278,18 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_ | |
| ) | ||
| } | ||
|
|
||
| ModifyMyPage -> myPageViewModel.patchMyProfile() | ||
| is EnableModify -> binding.tvMyPageBtnModifyProfile.isEnabled = event.isEnable | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun removeDialog() { | ||
| childFragmentManager.findFragmentByTag(TAG_DIALOG_MODIFY_PROFILE)?.let { | ||
| childFragmentManager.commit { | ||
| remove(it) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun showDialog( | ||
|
|
@@ -184,21 +303,21 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_ | |
| ) | ||
| } | ||
|
|
||
| private fun onModifySaveClick(): MyPageDialogClickListener = | ||
| object : MyPageDialogClickListener { | ||
| override fun onCancelClick() { | ||
| myPageViewModel.changeMyPageEvent( | ||
| ShowToast(getString(R.string.myPage_toast_modify_profile_cancel)) | ||
| ) | ||
| myPageViewModel.resetModifyProfile() | ||
| myPageViewModel.switchProfileType() | ||
| } | ||
|
|
||
| override fun onOkClick() { | ||
| myPageViewModel.changeMyPageEvent(ModifyMyPage) | ||
| myPageViewModel.switchProfileType() | ||
| } | ||
| } | ||
|
|
||
| private fun setupTierProgress(tierProgress: List<Int>) { | ||
| binding.glMyPageTierProgress.removeAllViews() | ||
|
|
@@ -228,6 +347,9 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_ | |
| requireContext().resources.displayMetrics, | ||
| ).toInt() | ||
|
|
||
| private fun showToast(message: String) = | ||
| Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show() | ||
|
|
||
| companion object { | ||
| private const val TAG_DIALOG_MODIFY_PROFILE = "TAG_DIALOG_MODIFY_PROFILE" | ||
| private const val TOTAL_BLOCK_COUNT = 20 | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
새로운 ViewBinding BaseClass 만들어두었습니다! HomeFragement참고