diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt index 438441b3..6691d4b9 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.CenterCrop import com.bumptech.glide.load.resource.bitmap.RoundedCorners +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.databinding.ItemMyLiveReservationBinding import kr.co.vividnext.sodalive.databinding.LiveBookingCardBinding @@ -94,7 +95,8 @@ class LiveReservationAdapter( binding.tvDayOfWeek.text = dateMap["dayOfWeek"] binding.tvTime.text = dateMap["time"] - binding.tvMonth.text = "${dateMap["month"]}월" + binding.tvMonth.text = + context.getString(R.string.live_reservation_month_label, dateMap["month"]) binding.tvDay.text = dateMap["day"] if (item.isReservation) { @@ -149,7 +151,8 @@ class LiveReservationAdapter( binding.tvDayOfWeek.text = dateMap["dayOfWeek"] binding.tvTime.text = dateMap["time"] - binding.tvMonth.text = "${dateMap["month"]}월" + binding.tvMonth.text = + context.getString(R.string.live_reservation_month_label, dateMap["month"]) binding.tvDay.text = dateMap["day"] if (item.price <= 0) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/all/LiveReservationAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/all/LiveReservationAllActivity.kt index 74deb157..5cab7c50 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/all/LiveReservationAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/all/LiveReservationAllActivity.kt @@ -83,7 +83,7 @@ class LiveReservationAllActivity : BaseActivity diff --git a/app/src/main/res/layout/item_my_live_reservation.xml b/app/src/main/res/layout/item_my_live_reservation.xml index 1ad022af..22a30809 100644 --- a/app/src/main/res/layout/item_my_live_reservation.xml +++ b/app/src/main/res/layout/item_my_live_reservation.xml @@ -14,7 +14,7 @@ android:layout_marginBottom="8dp" android:drawablePadding="8dp" android:fontFamily="@font/pretendard_bold" - android:text="내가 개설한 라이브" + android:text="@string/live_reservation_my_live" android:textColor="@color/color_80d8ff" android:textSize="18sp" app:drawableStartCompat="@drawable/ic_mic_colored" /> @@ -223,13 +223,13 @@ android:layout_height="wrap_content" android:background="@drawable/payment_free_background" android:fontFamily="@font/pretendard_regular" - android:gravity="center" - android:minWidth="52dp" - android:padding="4dp" - android:text="무료" - android:textColor="#263238" - android:textSize="14sp" - android:visibility="gone" + android:gravity="center" + android:minWidth="52dp" + android:padding="4dp" + android:text="@string/live_reservation_free" + android:textColor="#263238" + android:textSize="14sp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/live_booking_card.xml b/app/src/main/res/layout/live_booking_card.xml index 085c6d05..4ddc22b8 100644 --- a/app/src/main/res/layout/live_booking_card.xml +++ b/app/src/main/res/layout/live_booking_card.xml @@ -208,7 +208,7 @@ android:fontFamily="@font/pretendard_regular" android:minWidth="52dp" android:padding="4dp" - android:text="예약완료" + android:text="@string/live_reservation_complete" android:textColor="#FFF" android:textSize="14sp" android:visibility="gone" @@ -224,7 +224,7 @@ android:gravity="center" android:minWidth="52dp" android:padding="4dp" - android:text="무료" + android:text="@string/live_reservation_free" android:textColor="#263238" android:textSize="14sp" android:visibility="gone" diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index e2d7ea28..b391191b 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -298,9 +298,15 @@ Reservation has been cancelled. Close You cannot reserve a live you created. + Live reservation calendar + No live reservations right now.\nReserve a live on another date and join in. Reserve with %1$s cans Pay to join the live \"%1$s\". Reserve + %1$s mo + Reserved + Free + My live rooms 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 89b4324e..5342212c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -298,9 +298,15 @@ 予約がキャンセルされました。 閉じる 自分が作成したライブは予約できません。 + ライブ予約カレンダー + 現在予約中のライブはありません。\n別の日のライブを予約して参加してみてください。 %1$sCANで予約 ライブ「%1$s」に参加するために決済します。 予約する + %1$s月 + 予約済み + 無料 + 自分が開設したライブ 詳細 ログイン プロフィール編集 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index da65290c..df34d5b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -297,9 +297,15 @@ 예약이 취소되었습니다. 닫기 내가 만든 라이브는 예약할 수 없습니다. + 라이브, 예약 캘린더 + 지금 예약중인 라이브가 없습니다.\n다른 날짜의 라이브를 예약하고 참여해 보세요. %1$s캔으로 예약 \'%1$s\' 라이브에 참여하기 위해 결제합니다. 예약하기 + %1$s월 + 예약완료 + 무료 + 내가 개설한 라이브 자세히 LOGIN 프로필 수정