From 4a8442cb334c5ce845df5a86ffe6577ea0388b98 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 2 Dec 2025 15:35:47 +0900 Subject: [PATCH] =?UTF-8?q?LiveNowAll=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=EB=A6=AC=EC=86=8C=EC=8A=A4=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/now/all/LiveNowAllActivity.kt | 14 +++++++------- .../sodalive/live/now/all/LiveNowAllAdapter.kt | 8 +++++--- app/src/main/res/layout/activity_live_now_all.xml | 2 +- app/src/main/res/values-en/strings.xml | 5 +++++ app/src/main/res/values-ja/strings.xml | 5 +++++ app/src/main/res/values/strings.xml | 5 +++++ 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt index 7ed7daf1..b5735e56 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt @@ -17,7 +17,7 @@ import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration import kr.co.vividnext.sodalive.common.LoadingDialog import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.databinding.ActivityLiveNowAllBinding -import kr.co.vividnext.sodalive.extensions.moneyFormat +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.live.LiveViewModel import kr.co.vividnext.sodalive.live.room.LiveRoomActivity import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailFragment @@ -45,7 +45,7 @@ class LiveNowAllActivity : BaseActivity( } override fun setupView() { - binding.toolbar.tvBack.text = "지금 라이브 중 전체보기" + binding.toolbar.tvBack.text = getString(R.string.screen_live_now_all_title) binding.toolbar.tvBack.setOnClickListener { finish() } loadingDialog = LoadingDialog(this, layoutInflater) @@ -166,7 +166,7 @@ class LiveNowAllActivity : BaseActivity( LivePaymentDialog( activity = this, layoutInflater = layoutInflater, - title = "유료 라이브 입장", + title = getString(R.string.live_paid_title), startDateTime = if (hours >= 1) { dateFormat.format(beginDate) } else { @@ -177,17 +177,17 @@ class LiveNowAllActivity : BaseActivity( } else { null }, - desc = "${it.price.moneyFormat()}캔을 차감하고\n라이브에 입장 하시겠습니까?", + desc = getString(R.string.live_paid_desc, it.price), desc2 = if (hours >= 1) { - "라이브를 시작한 지 ${hours}시간 ${mins}분이 지났습니다. 라이브에 입장 후 30분 이내에 라이브가 종료될 수도 있습니다." + getString(R.string.live_paid_warning, hours, mins) } else { null }, - confirmButtonTitle = "결제 후 입장", + confirmButtonTitle = getString(R.string.live_paid_confirm), confirmButtonClick = { viewModel.enterRoom(roomId, onEnterRoomSuccess) }, - cancelButtonTitle = "취소", + cancelButtonTitle = getString(R.string.cancel), cancelButtonClick = {} ).show(screenWidth) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt index e92df81d..0954dff4 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt @@ -68,7 +68,7 @@ class LiveNowAllAdapter( ) binding.tvPrice.setBackgroundResource(R.drawable.bg_round_corner_13_3_dd4500) } else { - binding.tvPrice.text = "무료" + binding.tvPrice.text = context.getString(R.string.screen_live_now_all_free) binding.tvPrice.setCompoundDrawables(null, null, null, null) binding.tvPrice.setBackgroundResource(R.drawable.bg_round_corner_13_3_111111) } @@ -92,12 +92,14 @@ class LiveNowAllAdapter( binding.llRemainingParticipant.visibility = View.VISIBLE if (item.numberOfPeople > item.numberOfParticipate) { binding.tvRemainingParticipantNumber.visibility = View.VISIBLE - binding.tvRemainingParticipant.text = "잔여" + binding.tvRemainingParticipant.text = + context.getString(R.string.screen_live_now_all_remaining) binding.tvRemainingParticipantNumber.text = "${item.numberOfPeople - item.numberOfParticipate}" } else { binding.tvRemainingParticipantNumber.visibility = View.GONE - binding.tvRemainingParticipant.text = "Sold out" + binding.tvRemainingParticipant.text = + context.getString(R.string.screen_live_now_all_sold_out) binding.tvRemainingParticipantNumber.text = "" } } else { diff --git a/app/src/main/res/layout/activity_live_now_all.xml b/app/src/main/res/layout/activity_live_now_all.xml index c58ffe38..4331835a 100644 --- a/app/src/main/res/layout/activity_live_now_all.xml +++ b/app/src/main/res/layout/activity_live_now_all.xml @@ -29,7 +29,7 @@ android:layout_gravity="center" android:layout_marginTop="28.3dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="현재 참여 가능한 라이브 방송이 없거나\n연령제한으로 입장이 불가능합니다.\n본인인증을 해보거나 채널을 팔로잉하고\n라이브 방송 알림을 받아보세요." + android:text="@string/screen_live_now_all_empty_message" android:textColor="@color/color_bbbbbb" android:textSize="13sp" android:lineSpacingExtra="8dp" diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 8d7ced3b..e2d7ea28 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -121,6 +121,11 @@ Live My Live now + All live now + There are no live streams available to join\nor entry is restricted by age.\nVerify your identity or follow channels\nto receive live alerts. + Free + Left + Sold out Popular creators Latest content View all diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c0007b1d..89b4324e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -121,6 +121,11 @@ ライブ マイ ライブ配信中 + ライブ中をすべて表示 + 現在参加できるライブ放送がないか\n年齢制限により入室できません。\n本人確認をするかチャンネルをフォローして\nライブ通知を受け取ってみてください。 + 無料 + 残り + 完売 人気クリエイター 最新コンテンツ すべて見る diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a9a8bb2a..da65290c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -120,6 +120,11 @@ 라이브 마이 지금 라이브 중 + 지금 라이브 중 전체보기 + 현재 참여 가능한 라이브 방송이 없거나\n연령제한으로 입장이 불가능합니다.\n본인인증을 해보거나 채널을 팔로잉하고\n라이브 방송 알림을 받아보세요. + 무료 + 잔여 + Sold out 인기 크리에이터 최신 콘텐츠 전체보기