From ee396b3102f3934f032d1e18cb5ebc88b5613545 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 3 Jan 2025 08:50:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=85=98=20=ED=88=AC?=
 =?UTF-8?q?=ED=91=9C=20-=20=EC=95=88=EB=82=B4=20=ED=8C=9D=EC=97=85=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20-=20=ED=88=AC=ED=91=9C=EC=8B=9C=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applicant/AuditionApplicantListAdapter.kt |  7 +++---
 .../GetAuditionApplicantListResponse.kt       |  2 +-
 .../role/AuditionRoleDetailActivity.kt        | 16 +++++++++++++-
 .../role/AuditionRoleDetailViewModel.kt       | 22 ++++++++++++++-----
 .../layout/activity_audition_role_detail.xml  |  5 ++---
 .../res/layout/item_audition_applicant.xml    |  5 +++--
 6 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audition/applicant/AuditionApplicantListAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audition/applicant/AuditionApplicantListAdapter.kt
index 8a98440..00b3d08 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audition/applicant/AuditionApplicantListAdapter.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audition/applicant/AuditionApplicantListAdapter.kt
@@ -29,7 +29,7 @@ class AuditionApplicantListAdapter(
             oldItem: GetAuditionRoleApplicantItem,
             newItem: GetAuditionRoleApplicantItem
         ): Boolean {
-            return oldItem == newItem
+            return oldItem == newItem && oldItem.voteCount == newItem.voteCount
         }
     }
 
@@ -41,6 +41,7 @@ class AuditionApplicantListAdapter(
             binding.ivPlayOrPause.setOnClickListener { onClickPlayOrPause(position) }
 
             binding.tvNickname.text = item.nickname
+            binding.tvCountVote.text = item.voteCount.toString()
             binding.ivProfile.load(item.profileImageUrl) {
                 crossfade(true)
                 placeholder(R.drawable.bg_placeholder)
@@ -49,9 +50,9 @@ class AuditionApplicantListAdapter(
 
             binding.ivPlayOrPause.setImageResource(
                 if (position == currentPlayingIndex) {
-                    R.drawable.ic_audition_play
-                } else {
                     R.drawable.ic_audition_pause
+                } else {
+                    R.drawable.ic_audition_play
                 }
             )
         }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audition/applicant/GetAuditionApplicantListResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/audition/applicant/GetAuditionApplicantListResponse.kt
index 4ecedf3..5771435 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audition/applicant/GetAuditionApplicantListResponse.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audition/applicant/GetAuditionApplicantListResponse.kt
@@ -15,5 +15,5 @@ data class GetAuditionRoleApplicantItem(
     @SerializedName("nickname") val nickname: String,
     @SerializedName("profileImageUrl") val profileImageUrl: String,
     @SerializedName("voiceUrl") val voiceUrl: String,
-    @SerializedName("voteCount") var voteCount: Long
+    @SerializedName("voteCount") val voteCount: Long
 )
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailActivity.kt
index ce7e614..a484546 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailActivity.kt
@@ -40,6 +40,7 @@ class AuditionRoleDetailActivity : BaseActivity<ActivityAuditionRoleDetailBindin
     private var isOpenInformation = false
     private var reApplication = false
     private var isDeleteAudioFile = false
+    private var isShowNotifyVote = true
 
     private val selectAudioActivityResultLauncher = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
@@ -141,7 +142,20 @@ class AuditionRoleDetailActivity : BaseActivity<ActivityAuditionRoleDetailBindin
 
         adapter = AuditionApplicantListAdapter(
             onClickPlayOrPause = {},
-            onClickVote = { viewModel.voteApplicant(it) }
+            onClickVote = {
+                if (isShowNotifyVote) {
+                    SodaDialog(
+                        activity = this@AuditionRoleDetailActivity,
+                        layoutInflater = layoutInflater,
+                        "투표 안내",
+                        "첫 투표 무료 - 이후 투표 유료 (하루에 총 11번 투표 가능)",
+                        confirmButtonTitle = "확인",
+                        confirmButtonClick = { isShowNotifyVote = false }
+                    ).show(screenWidth)
+                } else {
+                    viewModel.voteApplicant(it)
+                }
+            }
         )
 
         val recyclerView = binding.rvApplicant
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailViewModel.kt
index 458e770..36ddadd 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audition/role/AuditionRoleDetailViewModel.kt
@@ -228,7 +228,6 @@ class AuditionRoleDetailViewModel(private val repository: AuditionRepository) :
                     {
                         _isLoading.value = false
                         if (it.success) {
-                            _applicantListLiveData.value = emptyList()
                             page = 1
                             isLast = false
                             getAuditionRoleDetail(auditionRoleId = auditionRoleId)
@@ -266,11 +265,10 @@ class AuditionRoleDetailViewModel(private val repository: AuditionRepository) :
     }
 
     fun voteApplicant(position: Int) {
-        val updatedList = _applicantListLiveData.value?.toMutableList()
-        val applicantId = updatedList?.get(position)?.applicantId
+        val applicantId = _applicantListLiveData.value?.get(position)?.applicantId
 
         if (applicantId != null) {
-            _isLoading.value = false
+            _isLoading.value = true
             val request = VoteAuditionApplicantRequest(
                 applicantId = applicantId,
                 timezone = TimeZone.getDefault().id
@@ -286,7 +284,14 @@ class AuditionRoleDetailViewModel(private val repository: AuditionRepository) :
                     .subscribe(
                         {
                             if (it.success) {
-                                updatedList[position].voteCount += 1
+                                val updatedList =
+                                    _applicantListLiveData.value?.mapIndexed { index, item ->
+                                        if (index == position) {
+                                            item.copy(voteCount = item.voteCount + 1)
+                                        } else {
+                                            item
+                                        }
+                                    }
                                 _applicantListLiveData.value = updatedList!!
                             } else {
                                 if (it.message != null) {
@@ -310,7 +315,12 @@ class AuditionRoleDetailViewModel(private val repository: AuditionRepository) :
     }
 
     private fun addApplicantList(itemList: List<GetAuditionRoleApplicantItem>) {
-        val updatedList = _applicantListLiveData.value?.toMutableList() ?: mutableListOf()
+        val updatedList = if (page == 1) {
+            mutableListOf()
+        } else {
+            _applicantListLiveData.value?.toMutableList() ?: mutableListOf()
+        }
+
         updatedList.addAll(itemList)
         _applicantListLiveData.value = updatedList
     }
diff --git a/app/src/main/res/layout/activity_audition_role_detail.xml b/app/src/main/res/layout/activity_audition_role_detail.xml
index d7e538c..63ee072 100644
--- a/app/src/main/res/layout/activity_audition_role_detail.xml
+++ b/app/src/main/res/layout/activity_audition_role_detail.xml
@@ -134,7 +134,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/gmarket_sans_medium"
-                    android:text="참여자"
+                    android:text="참여자 "
                     android:textColor="@color/color_bbbbbb"
                     android:textSize="10.7sp" />
 
@@ -185,12 +185,11 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_applicant"
                 android:layout_width="0dp"
-                android:layout_height="0dp"
+                android:layout_height="match_parent"
                 android:layout_marginTop="12dp"
                 android:clipToPadding="false"
                 android:paddingHorizontal="13.3dp"
                 android:paddingBottom="12dp"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/ll_applicant_count" />
diff --git a/app/src/main/res/layout/item_audition_applicant.xml b/app/src/main/res/layout/item_audition_applicant.xml
index e54281c..3c6835e 100644
--- a/app/src/main/res/layout/item_audition_applicant.xml
+++ b/app/src/main/res/layout/item_audition_applicant.xml
@@ -13,6 +13,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:contentDescription="@null"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -45,9 +46,9 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_profile"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/iv_profile"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="UseCompoundDrawables">
 
         <ImageView