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<ActivityAudioContentDetailBindin
LayoutInflater.from(this)
) { can, message ->
if (can <= 0) {
- showToast("1코인 이상 후원하실 수 있습니다.")
+ showToast("1캔 이상 후원하실 수 있습니다.")
} else if (message.isBlank()) {
showToast("함께 보낼 메시지를 입력하세요.")
} else {
@@ -260,8 +260,8 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
}
}
- private fun donation(coin: Int, message: String) {
- viewModel.donation(audioContentId, coin, message) {
+ private fun donation(can: Int, message: String) {
+ viewModel.donation(audioContentId, can, message) {
viewModel.getAudioContentDetail(audioContentId = audioContentId) { finish() }
}
}
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
index 6ae8686..0cf58ef 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
@@ -72,9 +72,9 @@ class AudioContentOrderConfirmDialog(
}
dialogView.tvNotice.text = if (orderType == OrderType.RENTAL) {
- "콘텐츠를 대여하시겠습니까?\n아래 코인이 차감됩니다."
+ "콘텐츠를 대여하시겠습니까?\n아래 캔이 차감됩니다."
} else {
- "콘텐츠를 소장하시겠습니까?\n아래 코인이 차감됩니다."
+ "콘텐츠를 소장하시겠습니까?\n아래 캔이 차감됩니다."
}
dialogView.tvCancel.setOnClickListener {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadViewModel.kt
index 6f0c5cd..8c2bdb3 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadViewModel.kt
@@ -212,7 +212,7 @@ class AudioContentUploadViewModel(
}
if (!isPriceFreeLiveData.value!! && price < 10) {
- _toastLiveData.postValue("콘텐츠의 최소금액은 10코인 입니다.")
+ _toastLiveData.postValue("콘텐츠의 최소금액은 10캔 입니다.")
return false
}
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/GetCreatorProfileResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/GetCreatorProfileResponse.kt
index 613ef9e..fb9c75c 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/GetCreatorProfileResponse.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/GetCreatorProfileResponse.kt
@@ -42,7 +42,7 @@ data class UserDonationRankingResponse(
@SerializedName("userId") val userId: Long,
@SerializedName("nickname") val nickname: String,
@SerializedName("profileImage") val profileImage: String,
- @SerializedName("donationCoin") val donationCoin: Int
+ @SerializedName("donationCan") val donationCan: Int
)
data class SimilarCreatorResponse(
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/MakeLiveReservationResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/MakeLiveReservationResponse.kt
index 9673145..838dbbf 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/MakeLiveReservationResponse.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/MakeLiveReservationResponse.kt
@@ -13,5 +13,5 @@ data class MakeLiveReservationResponse(
@SerializedName("price") val price: String,
@SerializedName("haveCan") val haveCan: Int,
@SerializedName("useCan") val useCan: Int,
- @SerializedName("remainingCoin") val remainingCoin: Int
+ @SerializedName("remainingCan") val remainingCan: Int
) : Parcelable
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/complete/LiveReservationCompleteActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/complete/LiveReservationCompleteActivity.kt
index 8d21d71..fc7ef0e 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/complete/LiveReservationCompleteActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/complete/LiveReservationCompleteActivity.kt
@@ -34,9 +34,9 @@ class LiveReservationCompleteActivity : BaseActivity<ActivityLiveReservationComp
binding.tvDate.text = response.beginDateString
binding.tvPrice.text = response.price
- binding.tvHaveCoin.text = "${response.haveCan}"
- binding.tvUseCoin.text = "${response.useCan}"
- binding.tvRemainingCoin.text = "${response.remainingCoin}"
+ binding.tvHaveCan.text = "${response.haveCan}"
+ binding.tvUseCan.text = "${response.useCan}"
+ binding.tvRemainingCan.text = "${response.remainingCan}"
binding.tvGoHome.setOnClickListener {
val intent = Intent(applicationContext, MainActivity::class.java)
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationCancelActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationCancelActivity.kt
index a82df71..0c742cc 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationCancelActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationCancelActivity.kt
@@ -113,7 +113,7 @@ class LiveReservationCancelActivity : BaseActivity<ActivityLiveReservationCancel
startActivity(Intent(applicationContext, MainActivity::class.java))
}
- binding.tvCheckCoinStatus.setOnClickListener {
+ binding.tvCheckCanStatus.setOnClickListener {
startActivity(Intent(applicationContext, CanStatusActivity::class.java))
}
@@ -152,10 +152,10 @@ class LiveReservationCancelActivity : BaseActivity<ActivityLiveReservationCancel
}
if (response.price > 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<ActivityCanPaymentBinding>(
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" />
</RelativeLayout>
@@ -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" />
</LinearLayout>
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 캔" />
<LinearLayout
android:id="@+id/ll_price"
@@ -151,7 +151,7 @@
android:layout_marginHorizontal="26.7dp"
android:layout_marginTop="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
- android:text="- 충전된 코인의 유효기간은 충전 후 5년 입니다.\n- 결제 취소는 결제 후 7일 이내에만 할 수 있습니다.\n 단, 코인의 일부를 사용하면 결제 취소할 수 없습니다.\n- 광고성 이벤트 등 회사가 무료로 지급한 \n포인트는 환불되지 않습니다.\n- 자세한 내용은 요즘 이용약관에서 확인할 수 있습니다."
+ android:text="- 충전된 캔의 유효기간은 충전 후 5년 입니다.\n- 결제 취소는 결제 후 7일 이내에만 할 수 있습니다.\n 단, 캔의 일부를 사용하면 결제 취소할 수 없습니다.\n- 광고성 이벤트 등 회사가 무료로 지급한 \n포인트는 환불되지 않습니다.\n- 자세한 내용은 요즘 이용약관에서 확인할 수 있습니다."
android:textColor="@color/color_777777"
android:textSize="12sp" />
</LinearLayout>
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캔" />
<TextView
android:id="@+id/tv_non_cancellable"
@@ -259,7 +259,7 @@
android:layout_marginHorizontal="23.3dp"
android:layout_marginTop="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
- android:text="취소요청시, 차감했던 코인은 환불처리 됩니다. 라이브 참여인원 제한에 따라 재예약이 불가할 수 있습니다."
+ android:text="취소요청시, 차감했던 캔은 환불처리 됩니다. 라이브 참여인원 제한에 따라 재예약이 불가할 수 있습니다."
android:textColor="@color/color_ff5c49" />
<TextView
@@ -304,7 +304,7 @@
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_eeeeee"
android:textSize="20sp"
- tools:text="결제한 500코인이\n환불처리 되었습니다." />
+ tools:text="결제한 500캔이\n환불처리 되었습니다." />
<LinearLayout
android:layout_width="match_parent"
@@ -328,7 +328,7 @@
android:textSize="15sp" />
<TextView
- android:id="@+id/tv_check_coin_status"
+ android:id="@+id/tv_check_can_status"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -336,7 +336,7 @@
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingVertical="16dp"
- android:text="코인내역 확인하기"
+ android:text="캔내역 확인하기"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
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">
<TextView
- android:id="@+id/tv_have_coin"
+ android:id="@+id/tv_have_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
@@ -237,7 +237,7 @@
tools:ignore="RelativeOverlap">
<TextView
- android:id="@+id/tv_use_coin"
+ android:id="@+id/tv_use_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
@@ -280,7 +280,7 @@
tools:ignore="RelativeOverlap">
<TextView
- android:id="@+id/tv_remaining_coin"
+ android:id="@+id/tv_remaining_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
diff --git a/app/src/main/res/layout/activity_live_room_create.xml b/app/src/main/res/layout/activity_live_room_create.xml
index 24f95c3..b62d53c 100644
--- a/app/src/main/res/layout/activity_live_room_create.xml
+++ b/app/src/main/res/layout/activity_live_room_create.xml
@@ -653,7 +653,7 @@
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:paddingVertical="16.7dp"
- android:text="100 코인"
+ android:text="100 캔"
android:textColor="@color/color_9970ff"
android:textSize="14.7sp" />
@@ -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" />
</LinearLayout>
@@ -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" />
</LinearLayout>
@@ -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" />
<TextView
- android:id="@+id/tv_coin"
+ android:id="@+id/tv_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="13.3dp"
android:fontFamily="@font/gmarket_sans_medium"
- android:text="코인"
+ android:text="캔"
android:textColor="@color/color_9970ff"
android:textSize="13.3sp" />
</RelativeLayout>
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" />
<LinearLayout
diff --git a/app/src/main/res/layout/activity_user_profile_live_all.xml b/app/src/main/res/layout/activity_user_profile_live_all.xml
index 1f72cfc..aa847d4 100644
--- a/app/src/main/res/layout/activity_user_profile_live_all.xml
+++ b/app/src/main/res/layout/activity_user_profile_live_all.xml
@@ -33,7 +33,7 @@
android:textSize="12sp" />
<TextView
- android:id="@+id/tv_coin_today"
+ android:id="@+id/tv_can_today"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/tv_unit_today"
@@ -67,7 +67,7 @@
android:textSize="12sp" />
<TextView
- android:id="@+id/tv_coin_last_week"
+ android:id="@+id/tv_can_last_week"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/tv_unit_last_week"
@@ -101,7 +101,7 @@
android:textSize="12sp" />
<TextView
- android:id="@+id/tv_coin_this_month"
+ android:id="@+id/tv_can_this_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toStartOf="@+id/tv_unit_this_month"
diff --git a/app/src/main/res/layout/dialog_audio_content_order_confirm.xml b/app/src/main/res/layout/dialog_audio_content_order_confirm.xml
index 2d9fe05..3d7542d 100644
--- a/app/src/main/res/layout/dialog_audio_content_order_confirm.xml
+++ b/app/src/main/res/layout/dialog_audio_content_order_confirm.xml
@@ -129,7 +129,7 @@
android:gravity="center"
android:textColor="@color/color_eeeeee"
android:textSize="13.3sp"
- tools:text="콘텐츠를 소장하시겠습니까?\n아래 코인이 차감됩니다." />
+ tools:text="콘텐츠를 소장하시겠습니까?\n아래 캔이 차감됩니다." />
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_live_room_donation.xml b/app/src/main/res/layout/dialog_live_room_donation.xml
index b509bf8..c0ae5e5 100644
--- a/app/src/main/res/layout/dialog_live_room_donation.xml
+++ b/app/src/main/res/layout/dialog_live_room_donation.xml
@@ -28,7 +28,7 @@
app:drawableStartCompat="@drawable/ic_donation_white" />
<TextView
- android:id="@+id/tv_coin"
+ android:id="@+id/tv_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@@ -50,13 +50,13 @@
android:background="@color/color_909090" />
<EditText
- android:id="@+id/et_donation_coin"
+ android:id="@+id/et_donation_can"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:background="@drawable/bg_round_corner_6_7_88333333"
android:fontFamily="@font/gmarket_sans_medium"
- android:hint="몇 코인을 후원할까요?"
+ android:hint="몇 캔을 후원할까요?"
android:importantForAutofill="no"
android:inputType="numberSigned"
android:padding="13.3dp"
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 8f30cb8..595fe1c 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
@@ -32,7 +32,7 @@
</RelativeLayout>
<RelativeLayout
- android:id="@+id/rl_total_coin"
+ android:id="@+id/rl_total_can"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
@@ -42,7 +42,7 @@
android:paddingVertical="10.7dp">
<TextView
- android:id="@+id/tv_total_coin_title"
+ android:id="@+id/tv_total_can_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
@@ -53,13 +53,13 @@
android:textSize="13.3sp" />
<TextView
- android:id="@+id/tv_total_coin"
+ android:id="@+id/tv_total_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="2.7dp"
- android:layout_toStartOf="@+id/tv_total_coin_unit"
- android:layout_toEndOf="@+id/tv_total_coin_title"
+ android:layout_toStartOf="@+id/tv_total_can_unit"
+ android:layout_toEndOf="@+id/tv_total_can_title"
android:fontFamily="@font/gmarket_sans_medium"
android:gravity="end"
android:textColor="@color/color_9970ff"
@@ -67,13 +67,13 @@
tools:text="1,999,999" />
<TextView
- android:id="@+id/tv_total_coin_unit"
+ android:id="@+id/tv_total_can_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:fontFamily="@font/gmarket_sans_medium"
- android:text="코인"
+ android:text="캔"
android:textColor="@color/color_bbbbbb"
android:textSize="10.7sp"
tools:ignore="SmallSp" />
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">
<TextView
- android:id="@+id/tv_coin"
+ android:id="@+id/tv_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_round_corner_10_9970ff"
diff --git a/app/src/main/res/layout/fragment_live_room_detail.xml b/app/src/main/res/layout/fragment_live_room_detail.xml
index 8f9c1e0..c1447e5 100644
--- a/app/src/main/res/layout/fragment_live_room_detail.xml
+++ b/app/src/main/res/layout/fragment_live_room_detail.xml
@@ -41,7 +41,7 @@
tools:text="🧸여자들이 좋아하는 남자 스타일은?" />
<RelativeLayout
- android:id="@+id/rl_date_and_coin"
+ android:id="@+id/rl_date_and_can"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="13.3dp"
@@ -58,7 +58,7 @@
tools:text="2021.06.20 SUN 10p.m" />
<TextView
- android:id="@+id/tv_coin"
+ android:id="@+id/tv_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@@ -75,7 +75,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:layout_below="@+id/tv_coin"
+ android:layout_below="@+id/tv_can"
android:layout_marginTop="8dp"
android:background="@color/color_88909090" />
</RelativeLayout>
@@ -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">
<TextView
android:id="@+id/tv_participate_expression"
diff --git a/app/src/main/res/layout/item_audio_content_comment.xml b/app/src/main/res/layout/item_audio_content_comment.xml
index 7c4a859..fc989c9 100644
--- a/app/src/main/res/layout/item_audio_content_comment.xml
+++ b/app/src/main/res/layout/item_audio_content_comment.xml
@@ -50,7 +50,7 @@
app:layout_constraintTop_toBottomOf="@+id/tv_comment_date">
<LinearLayout
- android:id="@+id/ll_donation_coin"
+ android:id="@+id/ll_donation_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginVertical="5dp"
@@ -68,7 +68,7 @@
android:src="@drawable/ic_coin_w" />
<TextView
- android:id="@+id/tv_donation_coin"
+ android:id="@+id/tv_donation_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
diff --git a/app/src/main/res/layout/item_can_charge.xml b/app/src/main/res/layout/item_can_charge.xml
index f81a8d4..e476b32 100644
--- a/app/src/main/res/layout/item_can_charge.xml
+++ b/app/src/main/res/layout/item_can_charge.xml
@@ -19,7 +19,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:text="5000 코인 + 1000 코인" />
+ tools:text="5000 캔 + 1000 캔" />
<LinearLayout
android:id="@+id/ll_price"
diff --git a/app/src/main/res/layout/item_can_charge_status.xml b/app/src/main/res/layout/item_can_charge_status.xml
index 7e5566e..1db9859 100644
--- a/app/src/main/res/layout/item_can_charge_status.xml
+++ b/app/src/main/res/layout/item_can_charge_status.xml
@@ -18,7 +18,7 @@
android:textSize="13.3sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:text="50코인" />
+ tools:text="50캔" />
<TextView
android:id="@+id/tv_date"
diff --git a/app/src/main/res/layout/item_live_reservation.xml b/app/src/main/res/layout/item_live_reservation.xml
index 5510b7e..ac959d6 100644
--- a/app/src/main/res/layout/item_live_reservation.xml
+++ b/app/src/main/res/layout/item_live_reservation.xml
@@ -99,7 +99,7 @@
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_7fe2e2e2"
android:textSize="12sp"
- tools:text="300코인" />
+ tools:text="300캔" />
<TextView
android:id="@+id/tv_complete_reservation"
diff --git a/app/src/main/res/layout/item_live_reservation_status.xml b/app/src/main/res/layout/item_live_reservation_status.xml
index d7a72c3..7c41e61 100644
--- a/app/src/main/res/layout/item_live_reservation_status.xml
+++ b/app/src/main/res/layout/item_live_reservation_status.xml
@@ -73,7 +73,7 @@
android:fontFamily="@font/gmarket_sans_medium"
android:textColor="@color/color_7fe2e2e2"
android:textSize="12sp"
- tools:text="300코인" />
+ tools:text="300캔" />
<TextView
android:id="@+id/tv_non_cancellable"
diff --git a/app/src/main/res/layout/item_live_room_chat.xml b/app/src/main/res/layout/item_live_room_chat.xml
index 3bd9b08..0aa361a 100644
--- a/app/src/main/res/layout/item_live_room_chat.xml
+++ b/app/src/main/res/layout/item_live_room_chat.xml
@@ -24,7 +24,7 @@
android:contentDescription="@null" />
<ImageView
- android:id="@+id/iv_coin"
+ android:id="@+id/iv_can"
android:layout_width="16.7dp"
android:layout_height="16.7dp"
android:layout_gravity="end|bottom"
diff --git a/app/src/main/res/layout/item_live_room_donation_message.xml b/app/src/main/res/layout/item_live_room_donation_message.xml
index e621120..95270ec 100644
--- a/app/src/main/res/layout/item_live_room_donation_message.xml
+++ b/app/src/main/res/layout/item_live_room_donation_message.xml
@@ -29,7 +29,7 @@
tools:text="user5님이" />
<TextView
- android:id="@+id/tv_coin_message"
+ android:id="@+id/tv_can_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@@ -39,7 +39,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_nickname"
- tools:text="1코인을 후원하셨습니다." />
+ tools:text="1캔을 후원하셨습니다." />
<TextView
android:id="@+id/tv_donation_message"
@@ -51,7 +51,7 @@
android:textSize="13.3sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/tv_coin_message"
+ app:layout_constraintTop_toBottomOf="@+id/tv_can_message"
tools:text="'테스트'" />
</androidx.constraintlayout.widget.ConstraintLayout>
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" />
<TextView
- android:id="@+id/tv_total_donation_coin"
+ android:id="@+id/tv_total_donation_can"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"