From af03d4dafd28f622d968b1e6868d81ce0089b54e Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 2 Dec 2025 20:17:10 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=A3=B8=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=B4=20=EB=A6=AC=EC=86=8C=EC=8A=A4?= =?UTF-8?q?=ED=99=94=20=EB=A7=88=EB=AC=B4=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/LiveRoomActivity.kt | 66 +++--- .../live/room/dialog/LiveCancelDialog.kt | 7 +- .../room/dialog/LiveRoomPasswordDialog.kt | 6 +- .../room/update/LiveRoomInfoEditDialog.kt | 12 +- .../main/res/layout/activity_live_room.xml | 6 +- .../res/layout/dialog_live_room_donation.xml | 198 +++++++++--------- .../dialog_live_room_donation_message.xml | 6 +- .../dialog_live_room_donation_ranking.xml | 50 ++--- .../layout/dialog_live_room_heart_ranking.xml | 11 +- .../layout/dialog_live_room_info_update.xml | 98 ++++----- .../res/layout/dialog_live_room_password.xml | 10 +- .../res/layout/dialog_live_room_profile.xml | 2 +- .../layout/dialog_live_room_user_profile.xml | 22 +- .../res/layout/fragment_live_room_detail.xml | 2 +- .../layout/item_live_room_profile_header.xml | 4 +- app/src/main/res/values-en/strings.xml | 47 +++++ app/src/main/res/values-ja/strings.xml | 47 +++++ app/src/main/res/values/strings.xml | 47 +++++ 18 files changed, 403 insertions(+), 238 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt index 9fd4f1d2..8af53873 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt @@ -285,7 +285,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB compressFormat = Bitmap.CompressFormat.JPEG, compressQuality = 90 ), - onSuccess = { file, uri -> + onSuccess = { file, _ -> roomInfoEditDialog.setCoverImageUri(file) }, onError = { e -> @@ -818,17 +818,17 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB newTitle, newContent, newCoverImageFile, - isActivateMenu, - menuId, - menu, - isAdult, - onSuccess = { - cropper.cleanup() - Toast.makeText( - applicationContext, - getString(R.string.screen_live_room_info_updated), - Toast.LENGTH_LONG - ).show() + isActivateMenu, + menuId, + menu, + isAdult, + onSuccess = { + cropper.cleanup() + Toast.makeText( + applicationContext, + getString(R.string.screen_live_room_info_updated), + Toast.LENGTH_LONG + ).show() agora.sendRawMessageToGroup( rawMessage = Gson().toJson( @@ -1885,7 +1885,8 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB // endregion // region heart - private val heartMessageQueue = mutableListOf>() // Pair + private val heartMessageQueue = + mutableListOf>() // Pair private var currentHeartMessageDurationMs: Long = 1500L private var heartNickname = "" set(value) { @@ -2204,25 +2205,30 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB private fun showHeartMessage() { val str = getString(R.string.screen_live_room_heart_sent, heartNickname) val spStr = SpannableString(str) + // 로케일별 따옴표/접미사가 달라 예외가 발생하지 않도록, 실제 닉네임 위치를 기준으로 강조 처리한다. + val nicknameStart = str.indexOf(heartNickname).takeIf { it >= 0 } + val nicknameEnd = nicknameStart?.plus(heartNickname.length) - spStr.setSpan( - ForegroundColorSpan( - ContextCompat.getColor( - applicationContext, - R.color.color_ec3aa6 - ) - ), - str.indexOf("'") + 1, - str.indexOf("'님"), - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE - ) + if (nicknameStart != null && nicknameEnd != null) { + spStr.setSpan( + ForegroundColorSpan( + ContextCompat.getColor( + applicationContext, + R.color.color_ec3aa6 + ) + ), + nicknameStart, + nicknameEnd, + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE + ) - spStr.setSpan( - StyleSpan(Typeface.BOLD), - str.indexOf("'"), - str.indexOf("'님"), - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE - ) + spStr.setSpan( + StyleSpan(Typeface.BOLD), + nicknameStart, + nicknameEnd, + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE + ) + } binding.tvHeartMessage.text = spStr binding.tvHeartMessage.visibility = View.VISIBLE } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveCancelDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveCancelDialog.kt index c37a350b..b519e671 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveCancelDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveCancelDialog.kt @@ -8,6 +8,7 @@ import android.view.View import android.view.WindowManager import android.widget.Toast import androidx.appcompat.app.AlertDialog +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.databinding.DialogLiveInputBinding import kr.co.vividnext.sodalive.extensions.dpToPx @@ -47,7 +48,11 @@ class LiveCancelDialog( alertDialog.dismiss() confirmButtonClick(dialogView.etReason.text.toString()) } else { - Toast.makeText(activity, "취소사유를 입력하세요.", Toast.LENGTH_LONG).show() + Toast.makeText( + activity, + activity.getString(R.string.screen_live_room_cancel_reason_required), + Toast.LENGTH_LONG + ).show() } } 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 ac734dc2..daef4542 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 @@ -11,6 +11,7 @@ import com.jakewharton.rxbinding4.widget.textChanges import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.schedulers.Schedulers +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.databinding.DialogLiveRoomPasswordBinding import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.extensions.moneyFormat @@ -38,10 +39,11 @@ class LiveRoomPasswordDialog( if (can > 0) { dialogView.tvCan.visibility = View.VISIBLE dialogView.tvCan.text = can.moneyFormat() - dialogView.tvConfirm.text = "으로 입장" + dialogView.tvConfirm.text = + activity.getString(R.string.screen_live_room_enter_with_amount_suffix) } else { dialogView.tvCan.visibility = View.GONE - dialogView.tvConfirm.text = "입장하기" + dialogView.tvConfirm.text = activity.getString(R.string.screen_live_room_enter) } compositeDisposable.add( diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt index 2be2046c..8ca51485 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt @@ -364,12 +364,20 @@ class LiveRoomInfoEditDialog( selectedMenuPreset == LiveRoomCreateViewModel.SelectedMenu.MENU_3 ) ) { - Toast.makeText(activity, "메뉴 1을 먼저 설정하세요", Toast.LENGTH_SHORT).show() + Toast.makeText( + activity, + activity.getString(R.string.screen_live_room_menu_first_required), + Toast.LENGTH_SHORT + ).show() return } if (menuList.size == 1 && selectedMenuPreset == LiveRoomCreateViewModel.SelectedMenu.MENU_3) { - Toast.makeText(activity, "메뉴 1과 메뉴 2를 먼저 설정하세요", Toast.LENGTH_SHORT).show() + Toast.makeText( + activity, + activity.getString(R.string.screen_live_room_menu_first_second_required), + Toast.LENGTH_SHORT + ).show() return } diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index 988f46a8..f8cdb04a 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -63,13 +63,13 @@ android:background="@color/color_ccffffff" android:gravity="center" android:paddingVertical="6.7dp" - android:text="dsfjkldfsjfsdkl" android:textColor="@color/color_111111" android:textSize="12sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="@+id/fl_margin" app:layout_constraintStart_toStartOf="@+id/fl_margin" - app:layout_constraintTop_toBottomOf="@+id/fl_margin" /> + app:layout_constraintTop_toBottomOf="@+id/fl_margin" + tools:text="@string/screen_live_room_notice_prefix" /> 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 95ce19a2..c0e7d098 100644 --- a/app/src/main/res/layout/dialog_live_room_donation.xml +++ b/app/src/main/res/layout/dialog_live_room_donation.xml @@ -24,14 +24,14 @@ + android:layout_centerVertical="true" + android:drawablePadding="6.7dp" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center_vertical" + android:text="@string/screen_live_room_donation_title" + android:textColor="@color/color_eeeeee" + android:textSize="18.3sp" + app:drawableStartCompat="@drawable/ic_donation_white" /> + android:fontFamily="@font/gmarket_sans_medium" + android:paddingHorizontal="13.3dp" + android:paddingVertical="8dp" + android:text="@string/screen_live_room_charge" + android:textColor="@color/color_80d8ff" + android:textSize="13.3sp" /> - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:button="@null" + android:drawablePadding="8dp" + android:fontFamily="@font/gmarket_sans_medium" + android:gravity="center" + android:paddingHorizontal="8dp" + android:text="@string/screen_live_room_secret_mission" + android:textColor="@color/color_check_secret" + app:drawableStartCompat="@drawable/ic_select_square" /> + + android:layout_weight="1" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="12.7dp" + android:text="@string/screen_live_room_donation_plus_10" + android:textColor="@color/white" + android:textSize="14.7sp" /> - + android:layout_weight="1" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="12.7dp" + android:text="@string/screen_live_room_donation_plus_100" + android:textColor="@color/white" + android:textSize="14.7sp" /> - + android:layout_weight="1" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="12.7dp" + android:text="@string/screen_live_room_donation_plus_1000" + android:textColor="@color/white" + android:textSize="14.7sp" /> - - + android:layout_weight="1" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="12.7dp" + android:text="@string/screen_live_room_donation_plus_10000" + android:textColor="@color/white" + android:textSize="14.7sp" /> + + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="16dp" + android:text="@string/screen_live_room_cancel" + android:textColor="@color/color_3bb9f1" + android:textSize="18.3sp" /> - - + android:layout_weight="1.5" + android:background="@drawable/bg_round_corner_10_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="16dp" + android:text="@string/screen_live_room_donation_title" + android:textColor="@color/white" + android:textSize="18.3sp" /> + diff --git a/app/src/main/res/layout/dialog_live_room_donation_message.xml b/app/src/main/res/layout/dialog_live_room_donation_message.xml index 3c85a4b4..c602feef 100644 --- a/app/src/main/res/layout/dialog_live_room_donation_message.xml +++ b/app/src/main/res/layout/dialog_live_room_donation_message.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:fontFamily="@font/gmarket_sans_bold" - android:text="후원 히스토리" + android:text="@string/screen_live_room_donation_history_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" app:layout_constraintStart_toStartOf="parent" @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:fontFamily="@font/gmarket_sans_light" - android:text="닫기" + android:text="@string/screen_live_room_close" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -55,7 +55,7 @@ android:layout_marginTop="30dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="후원 히스토리가 없습니다." + android:text="@string/screen_live_room_donation_history_empty" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" android:visibility="gone" /> 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 4b57ca13..dd0366be 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 @@ -16,7 +16,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="20dp" android:fontFamily="@font/gmarket_sans_bold" - android:text="현재 라이브 후원랭킹" + android:text="@string/screen_live_room_donation_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -50,17 +50,18 @@ android:orientation="horizontal"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/gmarket_sans_bold" + android:text="@string/screen_live_room_total_label" + android:textColor="@color/color_d2d2d2" + android:textSize="13.3sp" /> @@ -68,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" - android:text=" (" + android:text="@string/screen_live_room_parenthesis_open" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -76,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text="일반" + android:text="@string/screen_live_room_donation_normal_label" android:textColor="@color/color_3bb9f1" android:textSize="13.3sp" /> @@ -84,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text="/" + android:text="@string/screen_live_room_separator_slash" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -92,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text="비밀" + android:text="@string/screen_live_room_donation_secret_label" android:textColor="@color/color_fedc00" android:textSize="13.3sp" /> @@ -100,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" - android:text=")" + android:text="@string/screen_live_room_parenthesis_close" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -126,15 +127,15 @@ tools:text="1,999,999" /> + android:id="@+id/tv_total_can_slash" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/gmarket_sans_medium" + android:gravity="end" + android:text="@string/screen_live_room_separator_slash" + android:textColor="@color/white" + android:textSize="14sp" + android:visibility="gone" /> @@ -174,7 +175,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text="전체" + android:text="@string/screen_live_room_total_count_label" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -192,7 +193,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text=" 명" + android:layout_marginStart="2dp" + android:text="@string/screen_live_room_people_unit" android:textColor="@color/color_777777" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/dialog_live_room_heart_ranking.xml b/app/src/main/res/layout/dialog_live_room_heart_ranking.xml index ea8288cd..52f15ede 100644 --- a/app/src/main/res/layout/dialog_live_room_heart_ranking.xml +++ b/app/src/main/res/layout/dialog_live_room_heart_ranking.xml @@ -16,7 +16,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="20dp" android:fontFamily="@font/gmarket_sans_bold" - android:text="현재 라이브 하트랭킹" + android:text="@string/screen_live_room_heart_ranking_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" - android:text="합계" + android:text="@string/screen_live_room_total_label" android:textColor="@color/color_d2d2d2" android:textSize="13.3sp" /> @@ -70,7 +70,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:fontFamily="@font/gmarket_sans_medium" - android:text="하트" + android:text="@string/screen_live_room_heart_label" android:textColor="@color/color_bbbbbb" android:textSize="10.7sp" tools:ignore="SmallSp" /> @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text="전체" + android:text="@string/screen_live_room_total_count_label" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -107,7 +107,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text=" 명" + android:layout_marginStart="2dp" + android:text="@string/screen_live_room_people_unit" android:textColor="@color/color_777777" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/dialog_live_room_info_update.xml b/app/src/main/res/layout/dialog_live_room_info_update.xml index 146ca82e..f5e2f827 100644 --- a/app/src/main/res/layout/dialog_live_room_info_update.xml +++ b/app/src/main/res/layout/dialog_live_room_info_update.xml @@ -16,7 +16,7 @@ android:layout_marginStart="13.3dp" android:layout_marginTop="13.3dp" android:fontFamily="@font/gmarket_sans_bold" - android:text="라이브 수정" + android:text="@string/screen_live_room_profile_edit_title" android:textColor="@color/color_eeeeee" android:textSize="18.3sp" /> @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" - android:text="제목" + android:text="@string/screen_live_room_title_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:background="@drawable/edittext_underline" android:fontFamily="@font/gmarket_sans_medium" - android:hint="라이브 제목을 입력해주세요." + android:hint="@string/screen_live_room_title_hint" android:importantForAutofill="no" android:inputType="textWebEditText" android:paddingHorizontal="6.7dp" @@ -112,7 +112,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:lineSpacingExtra="5sp" - android:text="공지" + android:text="@string/screen_live_room_notice" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -124,7 +124,7 @@ android:background="@drawable/bg_round_corner_6_7_303030" android:fontFamily="@font/gmarket_sans_medium" android:gravity="top" - android:hint="라이브 공지를 입력해 주세요" + android:hint="@string/screen_live_room_notice_hint" android:importantForAutofill="no" android:inputType="textMultiLine" android:overScrollMode="always" @@ -150,7 +150,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" - android:text="연령제한" + android:text="@string/screen_live_room_age_limit_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -165,7 +165,7 @@ android:layout_centerVertical="true" android:fontFamily="@font/gmarket_sans_medium" android:lineSpacingExtra="5sp" - android:text="19세 이상" + android:text="@string/screen_live_room_age_limit_adult" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" /> @@ -191,7 +191,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" - android:text="메뉴" + android:text="@string/screen_live_room_menu_label_title" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -206,7 +206,7 @@ android:layout_centerVertical="true" android:fontFamily="@font/gmarket_sans_medium" android:lineSpacingExtra="5sp" - android:text="메뉴를 활성화 하시겠습니까?" + android:text="@string/screen_live_room_menu_activate_question" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" /> @@ -253,12 +253,12 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/gmarket_sans_bold" + android:text="@string/screen_live_room_menu_preset_1" + android:textColor="@color/color_3bb9f1" + android:textSize="14.7sp" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/gmarket_sans_bold" + android:text="@string/screen_live_room_menu_preset_2" + android:textColor="@color/color_555555" + android:textSize="14.7sp" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/gmarket_sans_bold" + android:text="@string/screen_live_room_menu_preset_3" + android:textColor="@color/color_555555" + android:textSize="14.7sp" /> @@ -328,7 +328,7 @@ android:background="@drawable/bg_round_corner_6_7_222222" android:fontFamily="@font/gmarket_sans_medium" android:gravity="top" - android:hint="메뉴판을 작성해주세요." + android:hint="@string/screen_live_room_menu_hint" android:importantForAutofill="no" android:inputType="textMultiLine" android:overScrollMode="always" @@ -355,7 +355,7 @@ android:layout_centerVertical="true" android:fontFamily="@font/gmarket_sans_bold" android:lineSpacingExtra="5sp" - android:text="입장 메시지" + android:text="@string/screen_live_room_entry_message_label" android:textColor="@color/color_eeeeee" android:textSize="16.7sp" /> @@ -379,30 +379,30 @@ + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="13.3dp" + android:layout_weight="1" + android:background="@drawable/bg_round_corner_10_13181b_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="16dp" + android:text="@string/screen_live_room_cancel" + android:textColor="@color/color_3bb9f1" + android:textSize="18.3sp" /> + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="@drawable/bg_round_corner_10_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="16dp" + android:text="@string/screen_live_room_update_action" + android:textColor="@color/white" + android:textSize="18.3sp" /> 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 9bb5d452..a7c1cd3d 100644 --- a/app/src/main/res/layout/dialog_live_room_password.xml +++ b/app/src/main/res/layout/dialog_live_room_password.xml @@ -14,7 +14,7 @@ android:layout_marginTop="40dp" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" - android:text="비밀번호 입력" + android:text="@string/screen_live_room_password_title" android:textColor="@color/color_bbbbbb" android:textSize="18.3sp" app:layout_constraintEnd_toEndOf="parent" @@ -29,7 +29,7 @@ android:layout_marginTop="6dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="비공개 라이브의 입장 비밀번호를\n입력해 주세요." + android:text="@string/screen_live_room_password_description" android:textColor="@color/color_bbbbbb" android:textSize="15sp" app:layout_constraintEnd_toEndOf="parent" @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="6.7dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="비밀번호" + android:text="@string/screen_live_room_password_label" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -63,7 +63,7 @@ android:background="@drawable/edittext_underline" android:digits="0123456789" android:fontFamily="@font/gmarket_sans_medium" - android:hint="비밀번호를 입력해 주세요" + android:hint="@string/screen_live_room_password_hint" android:importantForAutofill="no" android:inputType="number" android:paddingHorizontal="6.7dp" @@ -99,7 +99,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" - android:text="취소" + android:text="@string/screen_live_room_cancel" android:textColor="@color/color_3bb9f1" android:textSize="18.3sp" /> diff --git a/app/src/main/res/layout/dialog_live_room_profile.xml b/app/src/main/res/layout/dialog_live_room_profile.xml index 22e80960..488115df 100644 --- a/app/src/main/res/layout/dialog_live_room_profile.xml +++ b/app/src/main/res/layout/dialog_live_room_profile.xml @@ -14,7 +14,7 @@ android:layout_marginStart="16.7dp" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center_vertical" - android:text="참여자" + android:text="@string/screen_live_room_participants" android:textColor="@color/color_eeeeee" android:textSize="15sp" app:layout_constraintBottom_toBottomOf="@+id/iv_close" diff --git a/app/src/main/res/layout/dialog_live_room_user_profile.xml b/app/src/main/res/layout/dialog_live_room_user_profile.xml index 8f34eb3b..ed0f6d98 100644 --- a/app/src/main/res/layout/dialog_live_room_user_profile.xml +++ b/app/src/main/res/layout/dialog_live_room_user_profile.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" - android:text="프로필" + android:text="@string/screen_live_room_profile_title" android:textColor="@color/color_eeeeee" android:textSize="14.7sp" /> @@ -118,7 +118,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="13dp" - android:text="스피커 초대" + android:text="@string/screen_live_room_invite_speaker" android:textColor="@color/color_3bb9f1" android:visibility="gone" /> @@ -133,7 +133,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="13dp" - android:text="스탭 지정" + android:text="@string/screen_live_room_set_manager" android:textColor="@color/color_3bb9f1" android:visibility="gone" /> @@ -148,7 +148,7 @@ android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="13dp" - android:text="내보내기" + android:text="@string/screen_live_room_kick_confirm" android:textColor="@color/color_3bb9f1" android:visibility="gone" /> @@ -158,13 +158,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="21.3dp" - android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" - android:fontFamily="@font/gmarket_sans_bold" - android:gravity="center" - android:paddingVertical="13dp" - android:text="3분간 채팅금지" - android:textColor="@color/color_3bb9f1" - android:visibility="gone" /> + android:background="@drawable/bg_round_corner_8_transparent_3bb9f1" + android:fontFamily="@font/gmarket_sans_bold" + android:gravity="center" + android:paddingVertical="13dp" + android:text="@string/screen_live_room_no_chatting_three_minutes" + android:textColor="@color/color_3bb9f1" + android:visibility="gone" /> diff --git a/app/src/main/res/layout/item_live_room_profile_header.xml b/app/src/main/res/layout/item_live_room_profile_header.xml index e176ac3b..a277fb28 100644 --- a/app/src/main/res/layout/item_live_room_profile_header.xml +++ b/app/src/main/res/layout/item_live_room_profile_header.xml @@ -38,9 +38,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text="/9" android:textColor="@color/color_bbbbbb" android:textSize="13sp" - android:visibility="gone" /> + android:visibility="gone" + tools:text="/9" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 9eb11b40..5b9df1d0 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -436,6 +436,53 @@ Chat mute Mute chat for 3 minutes? Skip + 19 + Current live heart ranking + Total + All + users + Current live donation ranking + Normal + Secret + ( + ) + / + Profile + Mute chat for 3 minutes + Donation history + No donation history. + Close + Donate + Charge + Secret mission + +10 + +100 + +1000 + +10000 + Cancel + Enter password + Enter the password for this private live. + Password + Please enter the password + to enter + Enter + Edit live + Title + Enter a live title. + Enter a live notice. + Age limit + 19+ + Menu + Enable menu? + Menu 1 + Menu 2 + Menu 3 + Write your menu. + Entry message + Update + Set menu 1 first. + Set menu 1 and menu 2 first. + Please enter a cancellation reason. 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 50876d8e..d8454f6b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -436,6 +436,53 @@ チャット禁止 3分間チャットを禁止しますか？ スキップ + 19 + 現在のライブハートランキング + 合計 + 全体 + 名 + 現在のライブ支援ランキング + 一般 + シークレット + ( + ) + / + プロフィール + 3分間チャット禁止 + 支援履歴 + 支援履歴がありません。 + 閉じる + 支援する + チャージ + シークレットミッション + +10 + +100 + +1000 + +10000 + キャンセル + パスワード入力 + 非公開ライブの入場パスワードを入力してください。 + パスワード + パスワードを入力してください + で入場 + 入場する + ライブ修正 + タイトル + ライブタイトルを入力してください。 + ライブ告知を入力してください + 年齢制限 + 19歳以上 + メニュー + メニューを有効にしますか？ + メニュー1 + メニュー2 + メニュー3 + メニュー表を作成してください。 + 入場メッセージ + 修正する + メニュー1を先に設定してください + メニュー1とメニュー2を先に設定してください + キャンセル理由を入力してください。 詳細 ログイン プロフィール編集 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 148f1643..330d21ae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -435,6 +435,53 @@ 채팅금지 3분간 채팅금지를 하겠습니까? 건너뛰기 + 19 + 현재 라이브 하트랭킹 + 합계 + 전체 + 명 + 현재 라이브 후원랭킹 + 일반 + 비밀 + ( + ) + / + 프로필 + 3분간 채팅금지 + 후원 히스토리 + 후원 히스토리가 없습니다. + 닫기 + 후원하기 + 충전 + 비밀미션 + +10 + +100 + +1000 + +10000 + 취소 + 비밀번호 입력 + 비공개 라이브의 입장 비밀번호를\n입력해 주세요. + 비밀번호 + 비밀번호를 입력해 주세요 + 으로 입장 + 입장하기 + 라이브 수정 + 제목 + 라이브 제목을 입력해주세요. + 라이브 공지를 입력해 주세요 + 연령제한 + 19세 이상 + 메뉴 + 메뉴를 활성화 하시겠습니까? + 메뉴 1 + 메뉴 2 + 메뉴 3 + 메뉴판을 작성해주세요. + 입장 메시지 + 수정하기 + 메뉴 1을 먼저 설정하세요 + 메뉴 1과 메뉴 2를 먼저 설정하세요 + 취소사유를 입력하세요. 자세히 LOGIN 프로필 수정