라이브룸 상세/태그 문자열 리소스 보완
This commit is contained in:
@@ -125,7 +125,7 @@ class LiveRoomDetailFragment(
|
|||||||
binding.tvTitle.text = response.title
|
binding.tvTitle.text = response.title
|
||||||
binding.tvDate.text = response.beginDateTime.convertDateFormat(
|
binding.tvDate.text = response.beginDateTime.convertDateFormat(
|
||||||
from = "yyyy.MM.dd EEE hh:mm a",
|
from = "yyyy.MM.dd EEE hh:mm a",
|
||||||
to = "yyyy년 MM월 dd일 (E) a hh시 mm분",
|
to = getString(R.string.screen_live_room_detail_date_format),
|
||||||
inputLocale = Locale.ENGLISH
|
inputLocale = Locale.ENGLISH
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -156,7 +156,7 @@ class LiveRoomDetailFragment(
|
|||||||
binding.ivShare2.setOnClickListener { shareRoom(response) }
|
binding.ivShare2.setOnClickListener { shareRoom(response) }
|
||||||
|
|
||||||
if (response.channelName.isNullOrBlank()) {
|
if (response.channelName.isNullOrBlank()) {
|
||||||
binding.tvParticipateExpression.setText(R.string.live_reservation_complete)
|
binding.tvParticipateExpression.setText(R.string.screen_live_room_reserver_label)
|
||||||
when {
|
when {
|
||||||
response.manager.id == SharedPreferenceManager.userId -> {
|
response.manager.id == SharedPreferenceManager.userId -> {
|
||||||
binding.llStartDelete.visibility = View.VISIBLE
|
binding.llStartDelete.visibility = View.VISIBLE
|
||||||
|
|||||||
@@ -78,15 +78,20 @@ class LiveRoomDetailViewModel(private val repository: LiveRepository) : BaseView
|
|||||||
|
|
||||||
val shareUrl = Utils.createOneLinkUrl(params = params)
|
val shareUrl = Utils.createOneLinkUrl(params = params)
|
||||||
|
|
||||||
|
val app = SodaLiveApplicationHolder.get()
|
||||||
val message = if (isPrivateRoom) {
|
val message = if (isPrivateRoom) {
|
||||||
"${SharedPreferenceManager.nickname}님이 귀하를 " +
|
app.getString(
|
||||||
"보이스온의 비공개라이브에 초대하였습니다.\n" +
|
R.string.screen_live_room_share_message_private,
|
||||||
"※ 라이브 참여: $shareUrl\n" +
|
SharedPreferenceManager.nickname,
|
||||||
"(입장 비밀번호 : $password)"
|
shareUrl,
|
||||||
|
password
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
"${SharedPreferenceManager.nickname}님이 귀하를 " +
|
app.getString(
|
||||||
"보이스온의 공개라이브에 초대하였습니다.\n" +
|
R.string.screen_live_room_share_message_public,
|
||||||
"※ 라이브 참여: $shareUrl"
|
SharedPreferenceManager.nickname,
|
||||||
|
shareUrl
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
onSuccess(message)
|
onSuccess(message)
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:fontFamily="@font/gmarket_sans_bold"
|
android:fontFamily="@font/gmarket_sans_bold"
|
||||||
android:text="관심사 선택"
|
android:text="@string/screen_live_tag_title"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
android:textSize="18.3sp" />
|
android:textSize="18.3sp" />
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:fontFamily="@font/gmarket_sans_medium"
|
android:fontFamily="@font/gmarket_sans_medium"
|
||||||
android:text="최대 3개까지 선택 가능합니다."
|
android:text="@string/screen_live_tag_subtitle"
|
||||||
android:textColor="@color/color_777777"
|
android:textColor="@color/color_777777"
|
||||||
android:textSize="13.3sp" />
|
android:textSize="13.3sp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@@ -65,7 +65,7 @@
|
|||||||
android:fontFamily="@font/gmarket_sans_bold"
|
android:fontFamily="@font/gmarket_sans_bold"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:paddingVertical="16dp"
|
android:paddingVertical="16dp"
|
||||||
android:text="확인"
|
android:text="@string/screen_live_tag_confirm"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
android:textSize="18.3sp" />
|
android:textSize="18.3sp" />
|
||||||
|
|
||||||
|
|||||||
@@ -429,6 +429,10 @@
|
|||||||
<string name="screen_live_tag_subtitle">You can select up to 3.</string>
|
<string name="screen_live_tag_subtitle">You can select up to 3.</string>
|
||||||
<string name="screen_live_tag_confirm">Confirm</string>
|
<string name="screen_live_tag_confirm">Confirm</string>
|
||||||
<string name="screen_live_room_unknown_error">An unknown error occurred. Please try again.</string>
|
<string name="screen_live_room_unknown_error">An unknown error occurred. Please try again.</string>
|
||||||
|
<string name="screen_live_room_detail_date_format">yyyy.MM.dd EEE hh:mm a</string>
|
||||||
|
<string name="screen_live_room_reserver_label">Reserved users</string>
|
||||||
|
<string name="screen_live_room_share_message_private">%1$s invited you to a private live on VoiceOn.\n\u203b Join: %2$s\n(Password: %3$s)</string>
|
||||||
|
<string name="screen_live_room_share_message_public">%1$s invited you to a public live on VoiceOn.\n\u203b Join: %2$s</string>
|
||||||
<string name="screen_my_notice_more">Details</string>
|
<string name="screen_my_notice_more">Details</string>
|
||||||
<string name="screen_my_login">Login</string>
|
<string name="screen_my_login">Login</string>
|
||||||
<string name="screen_my_edit_profile">Edit profile</string>
|
<string name="screen_my_edit_profile">Edit profile</string>
|
||||||
|
|||||||
@@ -429,6 +429,10 @@
|
|||||||
<string name="screen_live_tag_subtitle">最大3つまで選択できます。</string>
|
<string name="screen_live_tag_subtitle">最大3つまで選択できます。</string>
|
||||||
<string name="screen_live_tag_confirm">確認</string>
|
<string name="screen_live_tag_confirm">確認</string>
|
||||||
<string name="screen_live_room_unknown_error">不明なエラーが発生しました。もう一度お試しください。</string>
|
<string name="screen_live_room_unknown_error">不明なエラーが発生しました。もう一度お試しください。</string>
|
||||||
|
<string name="screen_live_room_detail_date_format">yyyy年 MM月 dd日 (E) a hh時 mm分</string>
|
||||||
|
<string name="screen_live_room_reserver_label">予約者</string>
|
||||||
|
<string name="screen_live_room_share_message_private">%1$sさんがVoiceOnの非公開ライブに招待しました。\n※ 参加: %2$s\n(入場パスワード: %3$s)</string>
|
||||||
|
<string name="screen_live_room_share_message_public">%1$sさんがVoiceOnの公開ライブに招待しました。\n※ 参加: %2$s</string>
|
||||||
<string name="screen_my_notice_more">詳細</string>
|
<string name="screen_my_notice_more">詳細</string>
|
||||||
<string name="screen_my_login">ログイン</string>
|
<string name="screen_my_login">ログイン</string>
|
||||||
<string name="screen_my_edit_profile">プロフィール編集</string>
|
<string name="screen_my_edit_profile">プロフィール編集</string>
|
||||||
|
|||||||
@@ -428,6 +428,10 @@
|
|||||||
<string name="screen_live_tag_subtitle">최대 3개까지 선택 가능합니다.</string>
|
<string name="screen_live_tag_subtitle">최대 3개까지 선택 가능합니다.</string>
|
||||||
<string name="screen_live_tag_confirm">확인</string>
|
<string name="screen_live_tag_confirm">확인</string>
|
||||||
<string name="screen_live_room_unknown_error">알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.</string>
|
<string name="screen_live_room_unknown_error">알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.</string>
|
||||||
|
<string name="screen_live_room_detail_date_format">yyyy년 MM월 dd일 (E) a hh시 mm분</string>
|
||||||
|
<string name="screen_live_room_reserver_label">예약자</string>
|
||||||
|
<string name="screen_live_room_share_message_private">%1$s님이 귀하를 보이스온의 비공개라이브에 초대하였습니다.\n※ 라이브 참여: %2$s\n(입장 비밀번호 : %3$s)</string>
|
||||||
|
<string name="screen_live_room_share_message_public">%1$s님이 귀하를 보이스온의 공개라이브에 초대하였습니다.\n※ 라이브 참여: %2$s</string>
|
||||||
<string name="screen_my_notice_more">자세히</string>
|
<string name="screen_my_notice_more">자세히</string>
|
||||||
<string name="screen_my_login">LOGIN</string>
|
<string name="screen_my_login">LOGIN</string>
|
||||||
<string name="screen_my_edit_profile">프로필 수정</string>
|
<string name="screen_my_edit_profile">프로필 수정</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user