diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusActivity.kt index 6db868cf..9e1e63a4 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation_status/LiveReservationStatusActivity.kt @@ -11,6 +11,7 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.LoadingDialog import kr.co.vividnext.sodalive.databinding.ActivityLiveReservationStatusBinding @@ -43,7 +44,7 @@ class LiveReservationStatusActivity : BaseActivity Unit @@ -21,6 +21,7 @@ class LiveReservationStatusAdapter( ) : RecyclerView.ViewHolder(binding.root) { fun bind(item: GetLiveReservationResponse) { + val context = binding.root.context binding.tvDate.text = item.beginDateTime binding.tvNickname.text = item.masterNickname binding.tvTitle.text = item.title @@ -31,9 +32,9 @@ class LiveReservationStatusAdapter( } binding.tvPrice.text = if (item.price > 0) { - "${item.price}캔" + context.getString(R.string.live_reservation_status_price, item.price) } else { - "무료" + context.getString(R.string.live_reservation_free) } if (item.cancelable) { @@ -41,7 +42,10 @@ class LiveReservationStatusAdapter( binding.tvCancel.visibility = View.VISIBLE } else { binding.tvCancel.visibility = View.GONE - binding.tvNonCancellable.visibility = View.VISIBLE + binding.tvNonCancellable.apply { + text = context.getString(R.string.live_reservation_status_not_cancelable) + visibility = View.VISIBLE + } } } } diff --git a/app/src/main/res/layout/activity_live_reservation_status.xml b/app/src/main/res/layout/activity_live_reservation_status.xml index a1b29139..d44133ab 100644 --- a/app/src/main/res/layout/activity_live_reservation_status.xml +++ b/app/src/main/res/layout/activity_live_reservation_status.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:fontFamily="@font/gmarket_sans_medium" - android:text="예약한 라이브가 없습니다." + android:text="@string/screen_live_reservation_status_empty" android:textColor="@color/color_bbbbbb" android:textSize="15sp" android:visibility="gone" 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 7c41e61f..bc97bf87 100644 --- a/app/src/main/res/layout/item_live_reservation_status.xml +++ b/app/src/main/res/layout/item_live_reservation_status.xml @@ -82,7 +82,7 @@ android:layout_alignParentEnd="true" android:layout_marginTop="15.3dp" android:fontFamily="sans-serif-light" - android:text="예약 취소 불가" + android:text="@string/live_reservation_status_not_cancelable" android:textColor="@color/color_777777" android:textSize="10.7sp" android:visibility="gone" @@ -99,7 +99,7 @@ android:background="@drawable/bg_round_corner_6_7_transparent_9970ff" android:fontFamily="@font/gmarket_sans_bold" android:padding="10.7dp" - android:text="예약\n취소" + android:text="@string/live_reservation_status_cancel" android:textColor="@color/color_9970ff" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index b391191b..239f1d57 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -303,10 +303,15 @@ Reserve with %1$s cans Pay to join the live \"%1$s\". Reserve + Live reservation status + No live reservations. %1$s mo Reserved Free My live rooms + %1$d cans + Cancel\nreservation + Cannot cancel Details Login Edit profile diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5342212c..08a333b6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -303,10 +303,15 @@ %1$sCANで予約 ライブ「%1$s」に参加するために決済します。 予約する + ライブ予約状況 + 予約したライブがありません。 %1$s月 予約済み 無料 自分が開設したライブ + %1$dCAN + 予約\nキャンセル + キャンセル不可 詳細 ログイン プロフィール編集 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df34d5b4..c139bdbf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -302,10 +302,15 @@ %1$s캔으로 예약 \'%1$s\' 라이브에 참여하기 위해 결제합니다. 예약하기 + 라이브 예약 현황 + 예약한 라이브가 없습니다. %1$s월 예약완료 무료 내가 개설한 라이브 + %1$d캔 + 예약\n취소 + 예약 취소 불가 자세히 LOGIN 프로필 수정