From 999f90ae80bf0df7cf747861d8c0652fdf39329f Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 14 Aug 2023 11:15:21 +0900 Subject: [PATCH] =?UTF-8?q?coin=20->=20can,=20=EC=BD=94=EC=9D=B8=20->=20?= =?UTF-8?q?=EC=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 으로 변경 --- .../comment/AudioContentCommentAdapter.kt | 24 +++++++-------- .../GetAudioContentCommentListResponse.kt | 2 +- .../detail/AudioContentDetailActivity.kt | 6 ++-- .../order/AudioContentOrderConfirmDialog.kt | 4 +-- .../upload/AudioContentUploadViewModel.kt | 2 +- .../profile/GetCreatorProfileResponse.kt | 2 +- .../MakeLiveReservationResponse.kt | 2 +- .../LiveReservationCompleteActivity.kt | 6 ++-- .../LiveReservationCancelActivity.kt | 8 ++--- .../LiveReservationStatusAdapter.kt | 2 +- .../sodalive/live/room/chat/LiveRoomChat.kt | 18 +++++------ .../room/detail/LiveRoomDetailFragment.kt | 8 ++--- .../room/dialog/LiveRoomPasswordDialog.kt | 6 ++-- .../room/donation/LiveRoomDonationDialog.kt | 30 +++++++++---------- .../LiveRoomDonationMessageAdapter.kt | 2 +- .../donation/LiveRoomDonationRankingDialog.kt | 2 +- .../mypage/can/payment/CanPaymentActivity.kt | 2 +- .../layout/activity_audio_content_detail.xml | 2 +- .../layout/activity_audio_content_upload.xml | 4 +-- .../main/res/layout/activity_can_payment.xml | 4 +-- .../main/res/layout/activity_can_status.xml | 2 +- .../activity_live_reservation_cancel.xml | 10 +++---- .../activity_live_reservation_complete.xml | 6 ++-- .../res/layout/activity_live_room_create.xml | 16 +++++----- app/src/main/res/layout/activity_sign_out.xml | 2 +- .../layout/activity_user_profile_live_all.xml | 6 ++-- .../dialog_audio_content_order_confirm.xml | 2 +- .../res/layout/dialog_live_room_donation.xml | 6 ++-- .../dialog_live_room_donation_ranking.xml | 14 ++++----- .../res/layout/dialog_live_room_password.xml | 2 +- .../res/layout/fragment_live_room_detail.xml | 8 ++--- .../res/layout/item_audio_content_comment.xml | 4 +-- app/src/main/res/layout/item_can_charge.xml | 2 +- .../res/layout/item_can_charge_status.xml | 2 +- .../main/res/layout/item_live_reservation.xml | 2 +- .../layout/item_live_reservation_status.xml | 2 +- .../main/res/layout/item_live_room_chat.xml | 2 +- .../item_live_room_donation_message.xml | 6 ++-- .../layout/item_user_profile_donation_all.xml | 2 +- 39 files changed, 116 insertions(+), 116 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt index db7bb19..69a336a 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt @@ -30,34 +30,34 @@ class AudioContentCommentAdapter( } val tvCommentLayoutParams = binding.tvComment.layoutParams as LinearLayout.LayoutParams - val coin = item.donationCoin - if (coin > 0) { + val can = item.donationCan + if (can > 0) { tvCommentLayoutParams.topMargin = 0 - binding.llDonationCoin.visibility = View.VISIBLE - binding.tvDonationCoin.text = coin.moneyFormat() - binding.llDonationCoin.setBackgroundResource( + binding.llDonationCan.visibility = View.VISIBLE + binding.tvDonationCan.text = can.moneyFormat() + binding.llDonationCan.setBackgroundResource( when { - coin >= 100000 -> { + can >= 100000 -> { R.drawable.bg_round_corner_10_7_973a3a } - coin >= 50000 -> { + can >= 50000 -> { R.drawable.bg_round_corner_10_7_d85e37 } - coin >= 10000 -> { + can >= 10000 -> { R.drawable.bg_round_corner_10_7_d38c38 } - coin >= 5000 -> { + can >= 5000 -> { R.drawable.bg_round_corner_10_7_59548f } - coin >= 1000 -> { + can >= 1000 -> { R.drawable.bg_round_corner_10_7_4d6aa4 } - coin >= 500 -> { + can >= 500 -> { R.drawable.bg_round_corner_10_7_2d7390 } @@ -68,7 +68,7 @@ class AudioContentCommentAdapter( ) } else { tvCommentLayoutParams.topMargin = 13.3f.dpToPx().toInt() - binding.llDonationCoin.visibility = View.GONE + binding.llDonationCan.visibility = View.GONE } binding.tvComment.layoutParams = tvCommentLayoutParams diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/GetAudioContentCommentListResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/GetAudioContentCommentListResponse.kt index 288deff..b3f0097 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/GetAudioContentCommentListResponse.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/GetAudioContentCommentListResponse.kt @@ -15,7 +15,7 @@ data class GetAudioContentCommentListItem( @SerializedName("nickname") val nickname: String, @SerializedName("profileUrl") val profileUrl: String, @SerializedName("comment") val comment: String, - @SerializedName("donationCoin") val donationCoin: Int, + @SerializedName("donationCan") val donationCan: Int, @SerializedName("date") val date: String, @SerializedName("replyCount") val replyCount: Int ) : Parcelable diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt index 29e0722..95ab107 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt @@ -248,7 +248,7 @@ class AudioContentDetailActivity : BaseActivity if (can <= 0) { - showToast("1코인 이상 후원하실 수 있습니다.") + showToast("1캔 이상 후원하실 수 있습니다.") } else if (message.isBlank()) { showToast("함께 보낼 메시지를 입력하세요.") } else { @@ -260,8 +260,8 @@ class AudioContentDetailActivity : BaseActivity 0) { - binding.tvCheckCoinStatus.visibility = View.VISIBLE - binding.tvPrice.text = "${response.price}코인" + binding.tvCheckCanStatus.visibility = View.VISIBLE + binding.tvPrice.text = "${response.price}캔" } else { - binding.tvCheckCoinStatus.visibility = View.GONE + binding.tvCheckCanStatus.visibility = View.GONE binding.tvPrice.text = "무료" } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusAdapter.kt index 99a50a0..5ad5bc9 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusAdapter.kt @@ -31,7 +31,7 @@ class LiveReservationStatusAdapter( } binding.tvPrice.text = if (item.price > 0) { - "${item.price}코인" + "${item.price}캔" } else { "무료" } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt index 06a4c51..b0d5c8f 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt @@ -233,7 +233,7 @@ data class LiveRoomNormalChat( } else { itemBinding.llMessageBg.setBackgroundResource(R.drawable.bg_round_corner_3_3_99000000) } - itemBinding.ivCoin.visibility = View.GONE + itemBinding.ivCan.visibility = View.GONE itemBinding.tvDonationMessage.visibility = View.GONE itemBinding.root.setBackgroundResource(0) itemBinding.root.setPadding(0) @@ -244,7 +244,7 @@ data class LiveRoomDonationChat( @SerializedName("profileUrl") val profileUrl: String, @SerializedName("nickname") val nickname: String, @SerializedName("chat") val chat: String, - @SerializedName("coin") val coin: Int, + @SerializedName("can") val can: Int, @SerializedName("donationMessage") val donationMessage: String, ) : LiveRoomChat() { @SuppressLint("SetTextI18n") @@ -285,7 +285,7 @@ data class LiveRoomDonationChat( itemBinding.tvNickname.text = spNickname itemBinding.ivProfile.setOnClickListener {} - itemBinding.ivCoin.visibility = View.VISIBLE + itemBinding.ivCan.visibility = View.VISIBLE itemBinding.ivBg.visibility = View.GONE itemBinding.ivCrown.visibility = View.GONE itemBinding.tvCreatorOrManager.visibility = View.GONE @@ -302,27 +302,27 @@ data class LiveRoomDonationChat( itemBinding.root.setBackgroundResource( when { - coin >= 100000 -> { + can >= 100000 -> { R.drawable.bg_round_corner_6_7_c25264 } - coin >= 50000 -> { + can >= 50000 -> { R.drawable.bg_round_corner_6_7_e6d85e37 } - coin >= 10000 -> { + can >= 10000 -> { R.drawable.bg_round_corner_6_7_e6d38c38 } - coin >= 5000 -> { + can >= 5000 -> { R.drawable.bg_round_corner_6_7_e659548f } - coin >= 1000 -> { + can >= 1000 -> { R.drawable.bg_round_corner_6_7_e64d6aa4 } - coin >= 500 -> { + can >= 500 -> { R.drawable.bg_round_corner_6_7_e62d7390 } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt index 6a05303..79b7ae1 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/detail/LiveRoomDetailFragment.kt @@ -152,16 +152,16 @@ class LiveRoomDetailFragment( } if (response.price > 0) { - binding.tvCoin.text = response.price.toString() - binding.tvCoin.setCompoundDrawablesWithIntrinsicBounds( + binding.tvCan.text = response.price.toString() + binding.tvCan.setCompoundDrawablesWithIntrinsicBounds( 0, 0, R.drawable.ic_can, 0 ) } else { - binding.tvCoin.text = "무료" - binding.tvCoin.setCompoundDrawablesWithIntrinsicBounds( + binding.tvCan.text = "무료" + binding.tvCan.setCompoundDrawablesWithIntrinsicBounds( 0, 0, 0, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveRoomPasswordDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveRoomPasswordDialog.kt index e3166ca..ac734dc 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveRoomPasswordDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveRoomPasswordDialog.kt @@ -36,11 +36,11 @@ class LiveRoomPasswordDialog( alertDialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) if (can > 0) { - dialogView.tvCoin.visibility = View.VISIBLE - dialogView.tvCoin.text = can.moneyFormat() + dialogView.tvCan.visibility = View.VISIBLE + dialogView.tvCan.text = can.moneyFormat() dialogView.tvConfirm.text = "으로 입장" } else { - dialogView.tvCoin.visibility = View.GONE + dialogView.tvCan.visibility = View.GONE dialogView.tvConfirm.text = "입장하기" } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt index 5abf219..9dea669 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt @@ -35,23 +35,23 @@ class LiveRoomDonationDialog( dialogView.tvCancel.setOnClickListener { bottomSheetDialog.dismiss() } dialogView.tvDonation.setOnClickListener { try { - val coin = dialogView.etDonationCoin.text.toString().toInt() + val can = dialogView.etDonationCan.text.toString().toInt() val message = dialogView.etDonationMessage.text.toString() - if (coin > 0) { + if (can > 0) { bottomSheetDialog.dismiss() - onClickDonation(coin, message) + onClickDonation(can, message) } else { Toast.makeText( activity, - "1코인 이상 후원하실 수 있습니다.", + "1캔 이상 후원하실 수 있습니다.", Toast.LENGTH_LONG ).show() } } catch (e: NumberFormatException) { Toast.makeText( activity, - "1코인 이상 후원하실 수 있습니다.", + "1캔 이상 후원하실 수 있습니다.", Toast.LENGTH_LONG ).show() } @@ -75,11 +75,11 @@ class LiveRoomDonationDialog( @SuppressLint("SetTextI18n") private fun setupView() { - dialogView.tvCoin.text = SharedPreferenceManager.can.moneyFormat() - dialogView.tvPlus10.setOnClickListener { addCoin(10) } - dialogView.tvPlus100.setOnClickListener { addCoin(100) } - dialogView.tvPlus1000.setOnClickListener { addCoin(1000) } - dialogView.tvPlus10000.setOnClickListener { addCoin(10000) } + dialogView.tvCan.text = SharedPreferenceManager.can.moneyFormat() + dialogView.tvPlus10.setOnClickListener { addCan(10) } + dialogView.tvPlus100.setOnClickListener { addCan(100) } + dialogView.tvPlus1000.setOnClickListener { addCan(1000) } + dialogView.tvPlus10000.setOnClickListener { addCan(10000) } dialogView.ivProfile.load(SharedPreferenceManager.profileImage) { crossfade(true) @@ -87,7 +87,7 @@ class LiveRoomDonationDialog( transformations(CircleCropTransformation()) } - dialogView.tvCoin.setOnClickListener { + dialogView.tvCan.setOnClickListener { bottomSheetDialog.dismiss() val intent = Intent(activity, CanChargeActivity::class.java) @@ -97,12 +97,12 @@ class LiveRoomDonationDialog( } @SuppressLint("SetTextI18n") - private fun addCoin(coin: Int) { + private fun addCan(can: Int) { try { - val currentCoin = dialogView.etDonationCoin.text.toString().toInt() - dialogView.etDonationCoin.setText((currentCoin + coin).toString()) + val currentCan = dialogView.etDonationCan.text.toString().toInt() + dialogView.etDonationCan.setText((currentCan + can).toString()) } catch (e: NumberFormatException) { - dialogView.etDonationCoin.setText(coin.toString()) + dialogView.etDonationCan.setText(can.toString()) } } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationMessageAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationMessageAdapter.kt index 17c1338..96e69ca 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationMessageAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationMessageAdapter.kt @@ -21,7 +21,7 @@ class LiveRoomDonationMessageAdapter( @SuppressLint("SetTextI18n") fun bind(item: LiveRoomDonationMessage) { binding.tvNickname.text = "${item.nickname}님이" - binding.tvCoinMessage.text = item.canMessage + binding.tvCanMessage.text = item.canMessage binding.tvDonationMessage.text = "\"${item.donationMessage}\"" binding.ivDelete.setOnClickListener { onClickDeleteMessage(item.uuid) } 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 953581e..eb9fbd1 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 @@ -35,7 +35,7 @@ class LiveRoomDonationRankingDialog( adapter.items.clear() adapter.items.addAll(it.donationList) adapter.notifyDataSetChanged() - dialogView.tvTotalCoin.text = it.totalCan.moneyFormat() + dialogView.tvTotalCan.text = it.totalCan.moneyFormat() dialogView.tvTotalCount.text = it.totalCount.moneyFormat() } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt index c1473ed..9cf31b9 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt @@ -207,7 +207,7 @@ class CanPaymentActivity : BaseActivity( viewModel.verify( request, onSuccess = { - Toast.makeText(applicationContext, "코인이 충전되었습니다", Toast.LENGTH_LONG).show() + Toast.makeText(applicationContext, "캔이 충전되었습니다", Toast.LENGTH_LONG).show() if (prevLiveRoom) { setResult(RESULT_OK) } else { diff --git a/app/src/main/res/layout/activity_audio_content_detail.xml b/app/src/main/res/layout/activity_audio_content_detail.xml index dbbcdbc..b8fbac3 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -425,7 +425,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_light" - android:text="코인으로" + android:text="캔으로" android:textColor="@color/white" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/activity_audio_content_upload.xml b/app/src/main/res/layout/activity_audio_content_upload.xml index 847fccf..a8d84c2 100644 --- a/app/src/main/res/layout/activity_audio_content_upload.xml +++ b/app/src/main/res/layout/activity_audio_content_upload.xml @@ -417,7 +417,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:fontFamily="@font/gmarket_sans_medium" - android:text="코인" + android:text="캔" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -450,7 +450,7 @@ android:layout_height="wrap_content" android:layout_marginTop="3dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="※ 콘텐츠의 최소금액은 10코인 입니다" + android:text="※ 콘텐츠의 최소금액은 10캔 입니다" android:textColor="@color/color_777777" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/activity_can_payment.xml b/app/src/main/res/layout/activity_can_payment.xml index 3f050e4..ed40230 100644 --- a/app/src/main/res/layout/activity_can_payment.xml +++ b/app/src/main/res/layout/activity_can_payment.xml @@ -55,7 +55,7 @@ app:layout_constraintBottom_toBottomOf="@+id/ic_can" app:layout_constraintStart_toEndOf="@+id/ic_can" app:layout_constraintTop_toTopOf="@+id/ic_can" - tools:text="5000 코인 + 1000 코인" /> + tools:text="5000 캔 + 1000 캔" /> diff --git a/app/src/main/res/layout/activity_can_status.xml b/app/src/main/res/layout/activity_can_status.xml index e5169e8..2de0b96 100644 --- a/app/src/main/res/layout/activity_can_status.xml +++ b/app/src/main/res/layout/activity_can_status.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:fontFamily="@font/gmarket_sans_light" - android:text="결제 코인" + android:text="결제 캔" android:textColor="@color/color_777777" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/activity_live_reservation_cancel.xml b/app/src/main/res/layout/activity_live_reservation_cancel.xml index 5841c36..6663c11 100644 --- a/app/src/main/res/layout/activity_live_reservation_cancel.xml +++ b/app/src/main/res/layout/activity_live_reservation_cancel.xml @@ -90,7 +90,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:textColor="@color/color_7fe2e2e2" android:textSize="12sp" - tools:text="300코인" /> + tools:text="300캔" /> + tools:text="결제한 500캔이\n환불처리 되었습니다." /> diff --git a/app/src/main/res/layout/activity_live_reservation_complete.xml b/app/src/main/res/layout/activity_live_reservation_complete.xml index cd6bfda..f4473c3 100644 --- a/app/src/main/res/layout/activity_live_reservation_complete.xml +++ b/app/src/main/res/layout/activity_live_reservation_complete.xml @@ -194,7 +194,7 @@ tools:ignore="RelativeOverlap"> @@ -666,7 +666,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16.7dp" - android:text="300 코인" + android:text="300 캔" android:textColor="@color/color_9970ff" android:textSize="14.7sp" /> @@ -687,7 +687,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16.7dp" - android:text="500 코인" + android:text="500 캔" android:textColor="@color/color_9970ff" android:textSize="14.7sp" /> @@ -701,7 +701,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16.7dp" - android:text="1000 코인" + android:text="1000 캔" android:textColor="@color/color_9970ff" android:textSize="14.7sp" /> @@ -714,7 +714,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16.7dp" - android:text="2000 코인" + android:text="2000 캔" android:textColor="@color/color_9970ff" android:textSize="14.7sp" /> @@ -733,7 +733,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="13.3dp" - android:layout_toStartOf="@+id/tv_coin" + android:layout_toStartOf="@+id/tv_can" android:background="@null" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" @@ -747,14 +747,14 @@ android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/activity_sign_out.xml b/app/src/main/res/layout/activity_sign_out.xml index 1c207dd..98b9c45 100644 --- a/app/src/main/res/layout/activity_sign_out.xml +++ b/app/src/main/res/layout/activity_sign_out.xml @@ -230,7 +230,7 @@ android:layout_marginHorizontal="26.7dp" android:layout_marginTop="13.3dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="계정을 삭제하면 회원님의 모든 콘텐츠와 활동 길고, 코인충전 및 적립, 사용내역 등의 기록이 삭제됩니다. 삭제된 정보는 복구할 수 없으니 신중히 결정해주세요.\n코인 충전하기를 통해 적립한 코인은 계정 삭제시 환불이 불가합니다. 또한 환불 신청 후 환불처리가 되기 전에 계정을 삭제하는 경우 포인트 사용내역을 확인할 수 없어 환불이 불가합니다. " + android:text="계정을 삭제하면 회원님의 모든 콘텐츠와 활동 길고, 캔충전 및 적립, 사용내역 등의 기록이 삭제됩니다. 삭제된 정보는 복구할 수 없으니 신중히 결정해주세요.\n캔 충전하기를 통해 적립한 캔은 계정 삭제시 환불이 불가합니다. 또한 환불 신청 후 환불처리가 되기 전에 계정을 삭제하는 경우 포인트 사용내역을 확인할 수 없어 환불이 불가합니다. " android:textColor="@color/color_ff5c49" /> + tools:text="콘텐츠를 소장하시겠습니까?\n아래 캔이 차감됩니다." /> diff --git a/app/src/main/res/layout/dialog_live_room_password.xml b/app/src/main/res/layout/dialog_live_room_password.xml index d07dfd0..aaf04b3 100644 --- a/app/src/main/res/layout/dialog_live_room_password.xml +++ b/app/src/main/res/layout/dialog_live_room_password.xml @@ -113,7 +113,7 @@ android:paddingVertical="16dp"> @@ -87,7 +87,7 @@ android:layout_marginTop="16.7dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/rl_date_and_coin"> + app:layout_constraintTop_toBottomOf="@+id/rl_date_and_can"> + tools:text="5000 캔 + 1000 캔" /> + tools:text="50캔" /> + tools:text="300캔" /> + tools:text="300캔" /> + tools:text="1캔을 후원하셨습니다." /> diff --git a/app/src/main/res/layout/item_user_profile_donation_all.xml b/app/src/main/res/layout/item_user_profile_donation_all.xml index e7f4c56..e7f9cfb 100644 --- a/app/src/main/res/layout/item_user_profile_donation_all.xml +++ b/app/src/main/res/layout/item_user_profile_donation_all.xml @@ -70,7 +70,7 @@ tools:text="Remix" />