[AN] fix: v0.2.1 QA 마이페이지 이슈 (#405)

woowacourse-teams · Oct 23, 2024 · 54082f6 · 54082f6
1 parent 45a6d0e
commit 54082f6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/android/app/src/main/java/com/happy/friendogly/presentation/ui/mypage/MyPageFragment.kt b/android/app/src/main/java/com/happy/friendogly/presentation/ui/mypage/MyPageFragment.kt
@@ -60,23 +60,27 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(R.layout.fragment_my_
 
                 is MyPageNavigationAction.NavigateToMyClubManger ->
                     (activity as MainActivityActionHandler).navigateToMyClub(isMyHead = true)
+
                 is MyPageNavigationAction.NavigateToMyParticipation ->
                     (activity as MainActivityActionHandler).navigateToMyClub(isMyHead = false)
+
                 is MyPageNavigationAction.NavigateToPetEdit ->
                     (activity as MainActivityActionHandler).navigateToRegisterPet(action.petProfile)
             }
         }
 
         viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
-            adapter.submitList(uiState.pets)
+            adapter.submitList(uiState.pets) {
+                binding.vpPetProfile.post {
+                    binding.vpPetProfile.setCurrentItem(0, false)
+                }
+            }
         }
     }
 
     override fun onResume() {
         super.onResume()
         viewModel.fetchPetMine()
         viewModel.fetchMemberMine()
-        viewModel.updateCurrentPage(0)
-        binding.vpPetProfile.setCurrentItem(0, false)
     }
 }
diff --git a/android/app/src/main/java/com/happy/friendogly/presentation/ui/mypage/MyPageViewModel.kt b/android/app/src/main/java/com/happy/friendogly/presentation/ui/mypage/MyPageViewModel.kt
@@ -30,11 +30,6 @@ class MyPageViewModel(
         MutableLiveData(null)
     val navigateAction: LiveData<Event<MyPageNavigationAction>> get() = _navigateAction
 
-    init {
-        fetchMemberMine()
-        fetchPetMine()
-    }
-
     fun fetchMemberMine() {
         viewModelScope.launch {
             getMemberMineUseCase().onSuccess { member ->
@@ -60,7 +55,11 @@ class MyPageViewModel(
 
                 val state = uiState.value ?: return@launch
 
-                _uiState.value = state.copy(pets = petsView + PetAddView(memberId = state.id))
+                if (petsView.size >= MAX_PET_SIZE) {
+                    _uiState.value = state.copy(pets = petsView)
+                } else {
+                    _uiState.value = state.copy(pets = petsView + PetAddView(memberId = state.id))
+                }
             }.onFailure {
                 // TODO 예외 처리
             }
@@ -143,6 +142,8 @@ class MyPageViewModel(
     }
 
     companion object {
+        const val MAX_PET_SIZE = 5
+
         fun factory(
             getPetsMineUseCase: GetPetsMineUseCase,
             getMemberMineUseCase: GetMemberMineUseCase,

diff --git a/android/app/src/main/res/layout/item_pet_add.xml b/android/app/src/main/res/layout/item_pet_add.xml
@@ -26,7 +26,7 @@
             android:id="@+id/iv_empty_pet"
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:src="@drawable/ic_empty_pet"
+            android:src="@drawable/ic_add_image"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
 
     <!--프로필 설정-->
     <string name="profile_setting_nickname">닉네임</string>
-    <string name="profile_setting_nickname_hint">닉네임을 입력해주세요</string>
+    <string name="profile_setting_nickname_hint">사용자 닉네임을 입력해주세요</string>
     <string name="profile_setting_profile_pic">프로필 사진</string>
     <string name="make_profile_title">프로필 만들기</string>
     <string name="make_profile_edit_title">프로필 수정하기</string>