feat: 프로필 아바타 추가

app/src/main/java/com/into/websoso/core/common/util/BindingAdapter.kt

@@ -11,6 +11,19 @@ import com.into.websoso.core.resource.R.drawable.img_loading_thumbnail
 import jp.wasabeef.transformers.coil.BlurTransformation
 
 object BindingAdapter {
+    @JvmStatic
+    @BindingAdapter("loads3ImageUrl")
+    fun loadS3ImageUrl(
+        view: ImageView,
+        s3ImageKey: String,
+    ) {
+        val fullUrl: String = view.getS3ImageUrl(s3ImageKey)
+
+        view.load(fullUrl) {
+            error(img_loading_thumbnail)
+        }
+    }
+
     @JvmStatic
     @BindingAdapter(
         value = ["loadImageUrl", "cornerRadius", "blurRadius", "isVectorImage", "isCircularImage"],

app/src/main/java/com/into/websoso/data/mapper/AvatarMapper.kt

@@ -8,6 +8,7 @@ fun AvatarResponseDto.toData(): AvatarEntity =
         avatarId = avatarId,
         avatarName = avatarName,
         avatarLine = avatarLine,
+        avatarProfileImage = avatarProfileImage,
         avatarImage = avatarImage,
         isRepresentative = isRepresentative,
     )

app/src/main/java/com/into/websoso/data/model/AvatarEntity.kt

@@ -1,9 +1,10 @@
 package com.into.websoso.data.model
 
 data class AvatarEntity(
-    val avatarId: Int,
+    val avatarId: Long,
     val avatarName: String,
     val avatarLine: String,
+    val avatarProfileImage: String,
     val avatarImage: String,
     val isRepresentative: Boolean,
 )

app/src/main/java/com/into/websoso/data/remote/api/AvatarApi.kt

@@ -4,6 +4,6 @@ import com.into.websoso.data.remote.response.AvatarsResponseDto
 import retrofit2.http.GET
 
 interface AvatarApi {
-    @GET("avatars")
+    @GET("avatar-profiles")
     suspend fun getAvatars(): AvatarsResponseDto
 }

app/src/main/java/com/into/websoso/data/remote/api/UserApi.kt

@@ -68,7 +68,7 @@ interface UserApi {
         @Query("nickname") nickname: String,
     ): UserNicknameValidityResponseDto
 
-    @PATCH("users/my-profile")
+    @PATCH("users/profile")
     suspend fun patchProfile(
         @Body userProfileEditRequestDto: UserProfileEditRequestDto,
     )

app/src/main/java/com/into/websoso/data/remote/request/UserProfileEditRequestDto.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class UserProfileEditRequestDto(
     @SerialName("avatarId")
-    val avatarId: Int?,
+    val avatarId: Long?,
     @SerialName("nickname")
     val nickname: String?,
     @SerialName("intro")

app/src/main/java/com/into/websoso/data/remote/response/AvatarsResponseDto.kt

@@ -5,18 +5,20 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class AvatarsResponseDto(
-    @SerialName("avatars")
+    @SerialName("avatarProfiles")
     val avatars: List<AvatarResponseDto>,
 ) {
     @Serializable
     data class AvatarResponseDto(
-        @SerialName("avatarId")
-        val avatarId: Int,
-        @SerialName("avatarName")
+        @SerialName("avatarProfileId")
+        val avatarId: Long,
+        @SerialName("avatarProfileName")
         val avatarName: String,
-        @SerialName("avatarLine")
+        @SerialName("avatarProfileLine")
         val avatarLine: String,
-        @SerialName("avatarImage")
+        @SerialName("avatarProfileImage")
+        val avatarProfileImage: String,
+        @SerialName("avatarCharacterImage")
         val avatarImage: String,
         @SerialName("isRepresentative")
         val isRepresentative: Boolean,

app/src/main/java/com/into/websoso/data/repository/UserRepository.kt

@@ -92,7 +92,7 @@ class UserRepository
         suspend fun fetchOtherUserProfile(userId: Long): OtherUserProfileEntity = userApi.getOtherUserProfile(userId).toData()
 
         suspend fun saveEditingUserProfile(
-            avatarId: Int?,
+            avatarId: Long?,
             nickname: String?,
             intro: String?,
             genrePreferences: List<String>,

app/src/main/java/com/into/websoso/ui/createFeed/CreateFeedActivity.kt

@@ -17,7 +17,7 @@ import coil.load
 import com.into.websoso.R.color.bg_detail_explore_chip_background_selector
 import com.into.websoso.R.color.bg_detail_explore_chip_stroke_selector
 import com.into.websoso.R.color.bg_detail_explore_chip_text_selector
-import com.into.websoso.R.color.gray_200_AEADB3
+import com.into.websoso.R.color.gray_200_949399
 import com.into.websoso.R.layout.activity_create_feed
 import com.into.websoso.R.style.body2
 import com.into.websoso.R.style.body4
@@ -81,7 +81,7 @@ class CreateFeedActivity : BaseActivity<ActivityCreateFeedBinding>(activity_crea
         binding.wsetCreateFeedSearchNovel.apply {
             setWebsosoFocusableInTouchMode(false)
             setWebsosoSearchHint(getString(wset_create_feed_search_novel))
-            setWebsosoSearchHintTextColor(gray_200_AEADB3)
+            setWebsosoSearchHintTextColor(gray_200_949399)
             setWebsosoSearchTextAppearance(body4)
             setWebsosoOnClickListener {
                 singleEventHandler.throttleFirst { showSearchNovelDialog() }

app/src/main/java/com/into/websoso/ui/detailExplore/DetailExploreDialogBottomSheet.kt

@@ -100,7 +100,7 @@ class DetailExploreDialogBottomSheet : BaseBottomSheetDialog<DialogDetailExplore
 
     private fun updateButtonColors(selectedFragmentTitle: SelectedFragmentTitle) {
         val selectedColor = requireContext().getColor(R.color.primary_100_6A5DFD)
-        val defaultColor = requireContext().getColor(R.color.gray_200_AEADB3)
+        val defaultColor = requireContext().getColor(R.color.gray_200_949399)
 
         when (selectedFragmentTitle) {
             INFO -> {

app/src/main/java/com/into/websoso/ui/detailExploreResult/DetailExploreResultDialogBottomSheet.kt

@@ -95,7 +95,7 @@ class DetailExploreResultDialogBottomSheet : BaseBottomSheetDialog<DialogDetailE
 
     private fun updateButtonColors(selectedFragmentTitle: SelectedFragmentTitle) {
         val selectedColor = requireContext().getColor(R.color.primary_100_6A5DFD)
-        val defaultColor = requireContext().getColor(R.color.gray_200_AEADB3)
+        val defaultColor = requireContext().getColor(R.color.gray_200_949399)
 
         when (selectedFragmentTitle) {
             INFO -> {

app/src/main/java/com/into/websoso/ui/feedDetail/adapter/FeedDetailCommentViewHolder.kt

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.into.websoso.R.color.black
-import com.into.websoso.R.color.gray_200_AEADB3
+import com.into.websoso.R.color.gray_200_949399
 import com.into.websoso.R.color.secondary_100_FF675D
 import com.into.websoso.core.common.util.getS3ImageUrl
 import com.into.websoso.databinding.ItemFeedDetailCommentBinding
@@ -37,14 +37,14 @@ class FeedDetailCommentViewHolder(
         if (comment.isBlocked) {
             binding.tvFeedUserName.text = "차단한 유저"
             binding.tvFeedDetailCommentContent.text = "차단한 유저의 댓글"
-            binding.tvFeedDetailCommentContent.setTextColor(gray_200_AEADB3.color())
+            binding.tvFeedDetailCommentContent.setTextColor(gray_200_949399.color())
             binding.ivFeedDetailMoreButton.isVisible = false
             return
         }
 
         if (comment.isHidden) {
             binding.tvFeedDetailCommentContent.text = "숨김 처리된 댓글"
-            binding.tvFeedDetailCommentContent.setTextColor(gray_200_AEADB3.color())
+            binding.tvFeedDetailCommentContent.setTextColor(gray_200_949399.color())
             binding.ivFeedDetailMoreButton.isVisible = false
             return
         }

app/src/main/java/com/into/websoso/ui/mapper/AvatarMapper.kt

@@ -8,6 +8,7 @@ fun AvatarEntity.toUi(nickname: String) =
         avatarId = avatarId,
         avatarName = avatarName,
         avatarLine = avatarLine.format(nickname),
-        avatarThumbnail = avatarImage,
+        avatarProfile = avatarProfileImage,
+        avatarImage = avatarImage,
         isRepresentative = isRepresentative,
     )

app/src/main/java/com/into/websoso/ui/onboarding/second/OnboardingSecondFragment.kt

@@ -5,7 +5,7 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import com.into.websoso.R.color.black
-import com.into.websoso.R.color.gray_200_AEADB3
+import com.into.websoso.R.color.gray_200_949399
 import com.into.websoso.R.layout.fragment_onboarding_second
 import com.into.websoso.core.common.ui.base.BaseFragment
 import com.into.websoso.core.resource.R.string.onboarding_second_input_birth_year
@@ -53,7 +53,7 @@ class OnboardingSecondFragment : BaseFragment<FragmentOnboardingSecondBinding>(f
                 ContextCompat.getColor(
                     context,
                     when (userModelInfo.birthYear) {
-                        0 -> gray_200_AEADB3
+                        0 -> gray_200_949399
                         else -> black
                     },
                 ),

app/src/main/java/com/into/websoso/ui/profileEdit/AvatarChangeBottomSheetDialog.kt

@@ -3,21 +3,19 @@ package com.into.websoso.ui.profileEdit
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.into.websoso.R
 import com.into.websoso.core.common.ui.base.BaseBottomSheetDialog
 import com.into.websoso.databinding.DialogAvatarChangeBinding
-import com.into.websoso.ui.profileEdit.adapter.AvatarChangeAdapter
-import com.into.websoso.ui.profileEdit.model.Avatar.Companion.animation
+import com.into.websoso.ui.profileEdit.adapter.AvatarPagerAdapter
 import com.into.websoso.ui.profileEdit.model.AvatarChangeUiState
-import com.into.websoso.ui.profileEdit.model.AvatarModel
 
 class AvatarChangeBottomSheetDialog : BaseBottomSheetDialog<DialogAvatarChangeBinding>(R.layout.dialog_avatar_change) {
     private val profileEditViewModel: ProfileEditViewModel by activityViewModels()
-    private val avatarChangeAdapter: AvatarChangeAdapter by lazy {
-        AvatarChangeAdapter { avatarModel -> profileEditViewModel.updateSelectedAvatar(avatarModel) }
+
+    private val avatarPagerAdapter: AvatarPagerAdapter by lazy {
+        AvatarPagerAdapter { avatarModel -> profileEditViewModel.updateSelectedAvatar(avatarModel) }
     }
 
     override fun onViewCreated(
@@ -49,35 +47,26 @@ class AvatarChangeBottomSheetDialog : BaseBottomSheetDialog<DialogAvatarChangeBi
     }
 
     private fun handleAvatarChangeUiState(uiState: AvatarChangeUiState) {
-        when {
-            uiState.loading -> Unit
+        if (uiState.avatars.isNotEmpty()) {
+            if (binding.vpProfileEditAvatar.adapter == null) {
+                setupViewPager()
+            }
 
-            uiState.error -> Unit
+            val currentPage = binding.vpProfileEditAvatar.currentItem
 
-            uiState.avatars.isNotEmpty() -> {
-                setupRecyclerView()
-                updateAvatarAnimation(uiState.selectedAvatar)
-                avatarChangeAdapter.submitList(uiState.avatars)
+            avatarPagerAdapter.submitList(uiState.avatars.chunked(10)) {
+                binding.vpProfileEditAvatar.setCurrentItem(currentPage, false)
             }
         }
     }
 
-    private fun setupRecyclerView() {
-        // TODO: 갯수가 일정 갯수 초과시 그리드 리사이클러뷰 가운데 정렬
-        if (binding.rvProfileEditAvatar.childCount > 0) return
-        binding.rvProfileEditAvatar.apply {
-            adapter = avatarChangeAdapter
-            layoutManager = GridLayoutManager(context, profileEditViewModel.getFormattedSpanCount())
-            itemAnimator = null
+    private fun setupViewPager() {
+        binding.vpProfileEditAvatar.apply {
+            adapter = avatarPagerAdapter
+            offscreenPageLimit = 1
         }
-    }
 
-    private fun updateAvatarAnimation(avatar: AvatarModel) {
-        if (avatar.avatarId == 0) return
-        binding.lavProfileEditAvatar.apply {
-            setAnimation(avatar.animation())
-            playAnimation()
-        }
+        binding.dotsIndicatorProfileEdit.attachTo(binding.vpProfileEditAvatar)
     }
 
     private fun onSaveClick() {

app/src/main/java/com/into/websoso/ui/profileEdit/ColumnSpacingItemDecoration.kt

@@ -0,0 +1,26 @@
+package com.into.websoso.ui.profileEdit
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class ColumnSpacingItemDecoration(
+    private val spanCount: Int,
+    private val spacing: Int,
+) : RecyclerView.ItemDecoration() {
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State,
+    ) {
+        val position = parent.getChildAdapterPosition(view)
+        val column = position / spanCount
+
+        if (column > 0) {
+            outRect.left = spacing
+        } else {
+            outRect.left = 0
+        }
+    }
+}

app/src/main/java/com/into/websoso/ui/profileEdit/ProfileEditActivity.kt

@@ -15,7 +15,7 @@ import androidx.core.widget.addTextChangedListener
 import com.into.websoso.R.color.bg_profile_edit_chip_background_selector
 import com.into.websoso.R.color.bg_profile_edit_chip_stroke_selector
 import com.into.websoso.R.color.bg_profile_edit_chip_text_selector
-import com.into.websoso.R.color.gray_200_AEADB3
+import com.into.websoso.R.color.gray_200_949399
 import com.into.websoso.R.color.gray_300_52515F
 import com.into.websoso.R.color.primary_100_6A5DFD
 import com.into.websoso.R.drawable.bg_profile_edit_gray_50_radius_12dp
@@ -109,7 +109,7 @@ class ProfileEditActivity : BaseActivity<ActivityProfileEditBinding>(activity_pr
                         primary_100_6A5DFD,
                     ).defaultColor
             } else {
-                AppCompatResources.getColorStateList(this, gray_200_AEADB3).defaultColor
+                AppCompatResources.getColorStateList(this, gray_200_949399).defaultColor
             },
         )
         binding.tvProfileEditNicknameCheckDuplicate.setBackgroundResource(

app/src/main/java/com/into/websoso/ui/profileEdit/ProfileEditViewModel.kt

@@ -237,15 +237,16 @@ class ProfileEditViewModel
                             ?.nicknameModel
                             ?.nickname ?: ""
                     val avatarsModel = avatars.map { it.toUi(previousNickname) }
+                    val representativeAvatar: AvatarModel? = avatarsModel.find { it.isRepresentative }
                     _avatarChangeUiState.value = avatarChangeUiState.value?.copy(
                         avatars = avatarsModel,
                         loading = false,
+                        selectedAvatar = representativeAvatar ?: AvatarModel(),
                     )
-                    val representativeAvatar = avatarsModel.find { it.isRepresentative }
                     updatePreviousProfile(
                         profileEditUiState.value?.profile?.copy(
                             avatarId = representativeAvatar?.avatarId ?: 0,
-                            avatarThumbnail = representativeAvatar?.avatarThumbnail ?: "",
+                            avatarThumbnail = representativeAvatar?.avatarProfile ?: "",
                         ) ?: ProfileModel(),
                     )
                 }.onFailure {
@@ -278,7 +279,7 @@ class ProfileEditViewModel
                 uiState.copy(
                     profile = uiState.profile.copy(
                         avatarId = selectedAvatar.avatarId,
-                        avatarThumbnail = selectedAvatar.avatarThumbnail,
+                        avatarThumbnail = selectedAvatar.avatarProfile,
                     ),
                 )
             }

app/src/main/java/com/into/websoso/ui/profileEdit/adapter/AvatarChangeAdapter.kt

@@ -17,11 +17,7 @@ class AvatarChangeAdapter(
         holder: AvatarChangeViewHolder,
         position: Int,
     ) {
-        if (holder.itemView.tag == null) {
-            holder.setupItem(getItem(position))
-        } else {
-            holder.updateItemSelection(getItem(position).isRepresentative)
-        }
+        holder.setupItem(getItem(position))
     }
 
     companion object {
@@ -34,7 +30,9 @@ class AvatarChangeAdapter(
             override fun areContentsTheSame(
                 oldItem: AvatarModel,
                 newItem: AvatarModel,
-            ): Boolean = oldItem == newItem
+            ): Boolean =
+                oldItem.avatarId == newItem.avatarId &&
+                    oldItem.isRepresentative == newItem.isRepresentative
         }
     }
 }

app/src/main/java/com/into/websoso/ui/profileEdit/adapter/AvatarChangeViewHolder.kt

@@ -16,15 +16,12 @@ class AvatarChangeViewHolder(
     }
 
     fun setupItem(avatar: AvatarModel) {
-        binding.root.tag = avatar.avatarId
         binding.avatar = avatar.copy(
-            avatarThumbnail = binding.root.getS3ImageUrl(avatar.avatarThumbnail),
+            avatarProfile = binding.root.getS3ImageUrl(avatar.avatarProfile),
         )
         binding.isSelected = avatar.isRepresentative
-    }
 
-    fun updateItemSelection(isRepresentative: Boolean) {
-        binding.isSelected = isRepresentative
+        binding.executePendingBindings()
     }
 
     companion object {