diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt index d892c00..891bd89 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt @@ -2123,9 +2123,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB ) ) invalidateChat() - lifecycleScope.launch { - viewModel.addDonationCan(message.can) - } if (message.signature != null) { addSignature(message.signature) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/GetLiveRoomDonationStatusResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/GetLiveRoomDonationStatusResponse.kt index d459acf..e755010 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/GetLiveRoomDonationStatusResponse.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/GetLiveRoomDonationStatusResponse.kt @@ -7,7 +7,8 @@ import com.google.gson.annotations.SerializedName data class GetLiveRoomDonationStatusResponse( @SerializedName("donationList") val donationList: List, @SerializedName("totalCount") val totalCount: Int, - @SerializedName("totalCan") val totalCan: Int + @SerializedName("totalCan") val totalCan: Int, + @SerializedName("totalSecretCan") val totalSecretCan: Int ) @Keep @@ -15,5 +16,6 @@ data class GetLiveRoomDonationItem( @SerializedName("profileImage") val profileImage: String, @SerializedName("nickname") val nickname: String, @SerializedName("userId") val userId: Long, - @SerializedName("can") val can: Int + @SerializedName("can") val can: Int, + @SerializedName("secretCan") val secretCan: Int ) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingAdapter.kt index 06bfb7b..c2e5967 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingAdapter.kt @@ -50,6 +50,12 @@ class LiveRoomDonationRankingAdapter : } binding.tvDonationCan.text = item.can.moneyFormat() + binding.tvDonationSecretCan.text = item.secretCan.moneyFormat() + binding.llDonationSecret.visibility = if (item.secretCan > 0) { + View.VISIBLE + } else { + View.GONE + } val lp = binding.rlDonationRanking.layoutParams as FrameLayout.LayoutParams diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingDialog.kt index eb9fbd1..811b949 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRankingDialog.kt @@ -37,6 +37,17 @@ class LiveRoomDonationRankingDialog( adapter.notifyDataSetChanged() dialogView.tvTotalCan.text = it.totalCan.moneyFormat() dialogView.tvTotalCount.text = it.totalCount.moneyFormat() + dialogView.tvTotalSecretCan.text = it.totalSecretCan.moneyFormat() + + if (it.totalSecretCan > 0) { + dialogView.llTotalCanSubTitle.visibility = View.VISIBLE + dialogView.tvTotalSecretCan.visibility = View.VISIBLE + dialogView.tvTotalCanSlash.visibility = View.VISIBLE + } else { + dialogView.llTotalCanSubTitle.visibility = View.GONE + dialogView.tvTotalSecretCan.visibility = View.GONE + dialogView.tvTotalCanSlash.visibility = View.GONE + } } } diff --git a/app/src/main/res/drawable/bg_round_corner_2_7_fedc00.xml b/app/src/main/res/drawable/bg_round_corner_2_7_fedc00.xml new file mode 100644 index 0000000..71aafeb --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_2_7_fedc00.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/dialog_live_room_donation_ranking.xml b/app/src/main/res/layout/dialog_live_room_donation_ranking.xml index 4214f96..4b57ca1 100644 --- a/app/src/main/res/layout/dialog_live_room_donation_ranking.xml +++ b/app/src/main/res/layout/dialog_live_room_donation_ranking.xml @@ -41,30 +41,112 @@ android:paddingHorizontal="18.7dp" android:paddingVertical="10.7dp"> - + android:orientation="horizontal"> - + + + + + + + + + + + + + + + + + android:layout_toEndOf="@+id/ll_total_can_title" + android:gravity="end"> + + + + + + + diff --git a/app/src/main/res/layout/item_live_room_donation_ranking.xml b/app/src/main/res/layout/item_live_room_donation_ranking.xml index 3ced7be..d1e09f2 100644 --- a/app/src/main/res/layout/item_live_room_donation_ranking.xml +++ b/app/src/main/res/layout/item_live_room_donation_ranking.xml @@ -2,7 +2,8 @@ + android:layout_height="wrap_content" + tools:background="@color/black"> - - - + android:layout_marginHorizontal="13.3dp" + android:layout_toEndOf="@+id/tv_nickname" + android:gravity="end|center_vertical" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1d3d4a7..11cd6a0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -33,6 +33,7 @@ #A285EB #3D2A6C #FFDC00 + #FEDC00 #4999E3 #35C2FF #97AEFF