klaus/sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

라이브룸 문자열 리소스화 마무리

Browse Source
This commit is contained in:
klaus
2025-12-02 20:17:10 +09:00
parent 09bc25f035
commit af03d4dafd
18 changed files with 403 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
View File

@@ -285,7 +285,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
compressFormat = Bitmap.CompressFormat.JPEG,
compressQuality = 90
),
onSuccess = { file, uri ->
onSuccess = { file, _ ->
roomInfoEditDialog.setCoverImageUri(file)
},
onError = { e ->
@@ -818,17 +818,17 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(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<ActivityLiveRoomBinding>(ActivityLiveRoomB
// endregion
// region heart
private val heartMessageQueue = mutableListOf<Pair<String, Long>>() // Pair<nickname, durationMs>
private val heartMessageQueue =
mutableListOf<Pair<String, Long>>() // Pair<nickname, durationMs>
private var currentHeartMessageDurationMs: Long = 1500L
private var heartNickname = ""
set(value) {
@@ -2204,25 +2205,30 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(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
}

7
app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveCancelDialog.kt
View File

@@ -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()
}
}

6
app/src/main/java/kr/co/vividnext/sodalive/live/room/dialog/LiveRoomPasswordDialog.kt
View File

@@ -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(

12
app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt
View File

@@ -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
}

6
app/src/main/res/layout/activity_live_room.xml
View File

@@ -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" />
<LinearLayout
android:id="@+id/ll_notice"
@@ -349,7 +349,7 @@
android:background="@drawable/bg_circle_ea3a25"
android:fontFamily="@font/gmarket_sans_bold"
android:padding="2.7dp"
android:text="19"
android:text="@string/screen_live_room_age_badge"
android:textColor="@color/white"
android:textSize="8sp"
tools:ignore="SmallSp" />

198
app/src/main/res/layout/dialog_live_room_donation.xml
View File

@@ -24,14 +24,14 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:drawablePadding="6.7dp"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center_vertical"
android:text="후원하기"
android:textColor="@color/color_eeeeee"
android:textSize="18.3sp"
app:drawableStartCompat="@drawable/ic_donation_white" />
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" />
<TextView
android:id="@+id/tv_can"
@@ -56,12 +56,12 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1"
android:fontFamily="@font/gmarket_sans_medium"
android:paddingHorizontal="13.3dp"
android:paddingVertical="8dp"
android:text="충전"
android:textColor="@color/color_80d8ff"
android:textSize="13.3sp" />
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" />
</RelativeLayout>
<View
@@ -80,30 +80,30 @@
<TextView
android:id="@+id/tv_secret"
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="비밀미션"
android:textColor="@color/color_check_secret"
app:drawableStartCompat="@drawable/ic_select_square" />
</RelativeLayout>
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" />
</RelativeLayout>
<EditText
android:id="@+id/et_donation_can"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:background="@drawable/bg_round_corner_6_7_88333333"
android:fontFamily="@font/gmarket_sans_medium"
android:hint="1캔 이상 입력하세요"
android:importantForAutofill="no"
android:inputType="numberSigned"
android:padding="13.3dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:background="@drawable/bg_round_corner_6_7_88333333"
android:fontFamily="@font/gmarket_sans_medium"
android:hint="@string/screen_live_room_donation_input_min"
android:importantForAutofill="no"
android:inputType="numberSigned"
android:padding="13.3dp"
android:textColor="@color/color_eeeeee"
android:textColorHint="@color/color_777777"
android:textCursorDrawable="@drawable/edit_text_cursor"
@@ -120,57 +120,57 @@
android:id="@+id/tv_plus_10"
android:layout_width="0dp"
android:layout_height="wrap_content"
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="+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_10"
android:textColor="@color/white"
android:textSize="14.7sp" />
<TextView
android:id="@+id/tv_plus_100"
<TextView
android:id="@+id/tv_plus_100"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
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="+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_100"
android:textColor="@color/white"
android:textSize="14.7sp" />
<TextView
android:id="@+id/tv_plus_1000"
<TextView
android:id="@+id/tv_plus_1000"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
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="+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_1000"
android:textColor="@color/white"
android:textSize="14.7sp" />
<TextView
android:id="@+id/tv_plus_10000"
<TextView
android:id="@+id/tv_plus_10000"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
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="+10000"
android:textColor="@color/white"
android:textSize="14.7sp" />
</LinearLayout>
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" />
</LinearLayout>
<View
android:layout_width="match_parent"
@@ -194,14 +194,14 @@
<EditText
android:id="@+id/et_donation_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10.3dp"
android:background="@drawable/bg_round_corner_6_7_88333333"
android:fontFamily="@font/gmarket_sans_medium"
android:hint="함께 보낼 메시지 입력(최대 1000자)"
android:importantForAutofill="no"
android:inputType="text"
android:maxLength="1000"
android:layout_height="wrap_content"
android:layout_marginStart="10.3dp"
android:background="@drawable/bg_round_corner_6_7_88333333"
android:fontFamily="@font/gmarket_sans_medium"
android:hint="@string/screen_live_room_donation_message_hint"
android:importantForAutofill="no"
android:inputType="text"
android:maxLength="1000"
android:maxLines="1"
android:padding="13.3dp"
android:textColor="@color/color_eeeeee"
@@ -223,26 +223,26 @@
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="취소"
android:textColor="@color/color_3bb9f1"
android:textSize="18.3sp" />
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" />
<TextView
android:id="@+id/tv_donation"
<TextView
android:id="@+id/tv_donation"
android:layout_width="0dp"
android:layout_height="wrap_content"
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="후원하기"
android:textColor="@color/white"
android:textSize="18.3sp" />
</LinearLayout>
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" />
</LinearLayout>
</LinearLayout>
</ScrollView>

6
app/src/main/res/layout/dialog_live_room_donation_message.xml
View File

@@ -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" />
</RelativeLayout>
@@ -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" />

50
app/src/main/res/layout/dialog_live_room_donation_ranking.xml
View File

@@ -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">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
android:text="합계"
android:textColor="@color/color_d2d2d2"
android:textSize="13.3sp" />
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" />
<LinearLayout
android:id="@+id/ll_total_can_sub_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:orientation="horizontal"
android:visibility="gone">
@@ -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" />
</LinearLayout>
@@ -126,15 +127,15 @@
tools:text="1,999,999" />
<TextView
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="/"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="gone" />
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" />
<TextView
android:id="@+id/tv_total_secret_can"
@@ -155,7 +156,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:fontFamily="@font/gmarket_sans_medium"
android:text="캔"
android:text="@string/screen_live_room_can_unit"
android:textColor="@color/color_bbbbbb"
android:textSize="10.7sp"
tools:ignore="SmallSp" />
@@ -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" />
</LinearLayout>

11
app/src/main/res/layout/dialog_live_room_heart_ranking.xml
View File

@@ -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" />
</LinearLayout>

98
app/src/main/res/layout/dialog_live_room_info_update.xml
View File

@@ -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 @@
<TextView
android:id="@+id/tv_select_menu_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
android:text="메뉴 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_1"
android:textColor="@color/color_3bb9f1"
android:textSize="14.7sp" />
</LinearLayout>
<LinearLayout
@@ -282,12 +282,12 @@
<TextView
android:id="@+id/tv_select_menu_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
android:text="메뉴 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_2"
android:textColor="@color/color_555555"
android:textSize="14.7sp" />
</LinearLayout>
<LinearLayout
@@ -311,12 +311,12 @@
<TextView
android:id="@+id/tv_select_menu_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/gmarket_sans_bold"
android:text="메뉴 3"
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" />
</LinearLayout>
</LinearLayout>
@@ -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 @@
<TextView
android:id="@+id/tv_cancel"
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="취소"
android:textColor="@color/color_3bb9f1"
android:textSize="18.3sp" />
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" />
<TextView
android:id="@+id/tv_confirm"
android:layout_width="0dp"
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="수정하기"
android:textColor="@color/white"
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" />
</LinearLayout>
</LinearLayout>

10
app/src/main/res/layout/dialog_live_room_password.xml
View File

@@ -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" />

2
app/src/main/res/layout/dialog_live_room_profile.xml
View File

@@ -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"

22
app/src/main/res/layout/dialog_live_room_user_profile.xml
View File

@@ -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" />
</LinearLayout>
@@ -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" />
<TextView
android:id="@+id/tv_tags"

2
app/src/main/res/layout/fragment_live_room_detail.xml
View File

@@ -44,7 +44,7 @@
android:background="@drawable/bg_round_corner_2_6_601d14"
android:paddingHorizontal="5.3dp"
android:paddingVertical="3.3dp"
android:text="19"
android:text="@string/screen_live_room_age_badge"
android:textColor="@color/color_e33621"
android:visibility="gone" />

4
app/src/main/res/layout/item_live_room_profile_header.xml
View File

@@ -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" />
</LinearLayout>

47
app/src/main/res/values-en/strings.xml
View File

@@ -436,6 +436,53 @@
<string name="screen_live_room_dialog_title_no_chat">Chat mute</string>
<string name="screen_live_room_dialog_no_chat_desc">Mute chat for 3 minutes?</string>
<string name="screen_live_room_dialog_skip">Skip</string>
<string name="screen_live_room_age_badge">19</string>
<string name="screen_live_room_heart_ranking_title">Current live heart ranking</string>
<string name="screen_live_room_total_label">Total</string>
<string name="screen_live_room_total_count_label">All</string>
<string name="screen_live_room_people_unit">users</string>
<string name="screen_live_room_donation_ranking_title">Current live donation ranking</string>
<string name="screen_live_room_donation_normal_label">Normal</string>
<string name="screen_live_room_donation_secret_label">Secret</string>
<string name="screen_live_room_parenthesis_open">(</string>
<string name="screen_live_room_parenthesis_close">)</string>
<string name="screen_live_room_separator_slash">/</string>
<string name="screen_live_room_profile_title">Profile</string>
<string name="screen_live_room_no_chatting_three_minutes">Mute chat for 3 minutes</string>
<string name="screen_live_room_donation_history_title">Donation history</string>
<string name="screen_live_room_donation_history_empty">No donation history.</string>
<string name="screen_live_room_close">Close</string>
<string name="screen_live_room_donation_title">Donate</string>
<string name="screen_live_room_charge">Charge</string>
<string name="screen_live_room_secret_mission">Secret mission</string>
<string name="screen_live_room_donation_plus_10">+10</string>
<string name="screen_live_room_donation_plus_100">+100</string>
<string name="screen_live_room_donation_plus_1000">+1000</string>
<string name="screen_live_room_donation_plus_10000">+10000</string>
<string name="screen_live_room_cancel">Cancel</string>
<string name="screen_live_room_password_title">Enter password</string>
<string name="screen_live_room_password_description">Enter the password for this private live.</string>
<string name="screen_live_room_password_label">Password</string>
<string name="screen_live_room_password_hint">Please enter the password</string>
<string name="screen_live_room_enter_with_amount_suffix"> to enter</string>
<string name="screen_live_room_enter">Enter</string>
<string name="screen_live_room_profile_edit_title">Edit live</string>
<string name="screen_live_room_title_label">Title</string>
<string name="screen_live_room_title_hint">Enter a live title.</string>
<string name="screen_live_room_notice_hint">Enter a live notice.</string>
<string name="screen_live_room_age_limit_label">Age limit</string>
<string name="screen_live_room_age_limit_adult">19+</string>
<string name="screen_live_room_menu_label_title">Menu</string>
<string name="screen_live_room_menu_activate_question">Enable menu?</string>
<string name="screen_live_room_menu_preset_1">Menu 1</string>
<string name="screen_live_room_menu_preset_2">Menu 2</string>
<string name="screen_live_room_menu_preset_3">Menu 3</string>
<string name="screen_live_room_menu_hint">Write your menu.</string>
<string name="screen_live_room_entry_message_label">Entry message</string>
<string name="screen_live_room_update_action">Update</string>
<string name="screen_live_room_menu_first_required">Set menu 1 first.</string>
<string name="screen_live_room_menu_first_second_required">Set menu 1 and menu 2 first.</string>
<string name="screen_live_room_cancel_reason_required">Please enter a cancellation reason.</string>
<string name="screen_my_notice_more">Details</string>
<string name="screen_my_login">Login</string>
<string name="screen_my_edit_profile">Edit profile</string>

47
app/src/main/res/values-ja/strings.xml
View File

@@ -436,6 +436,53 @@
<string name="screen_live_room_dialog_title_no_chat">チャット禁止</string>
<string name="screen_live_room_dialog_no_chat_desc">3分間チャットを禁止しますか？</string>
<string name="screen_live_room_dialog_skip">スキップ</string>
<string name="screen_live_room_age_badge">19</string>
<string name="screen_live_room_heart_ranking_title">現在のライブハートランキング</string>
<string name="screen_live_room_total_label">合計</string>
<string name="screen_live_room_total_count_label">全体</string>
<string name="screen_live_room_people_unit">名</string>
<string name="screen_live_room_donation_ranking_title">現在のライブ支援ランキング</string>
<string name="screen_live_room_donation_normal_label">一般</string>
<string name="screen_live_room_donation_secret_label">シークレット</string>
<string name="screen_live_room_parenthesis_open">(</string>
<string name="screen_live_room_parenthesis_close">)</string>
<string name="screen_live_room_separator_slash">/</string>
<string name="screen_live_room_profile_title">プロフィール</string>
<string name="screen_live_room_no_chatting_three_minutes">3分間チャット禁止</string>
<string name="screen_live_room_donation_history_title">支援履歴</string>
<string name="screen_live_room_donation_history_empty">支援履歴がありません。</string>
<string name="screen_live_room_close">閉じる</string>
<string name="screen_live_room_donation_title">支援する</string>
<string name="screen_live_room_charge">チャージ</string>
<string name="screen_live_room_secret_mission">シークレットミッション</string>
<string name="screen_live_room_donation_plus_10">+10</string>
<string name="screen_live_room_donation_plus_100">+100</string>
<string name="screen_live_room_donation_plus_1000">+1000</string>
<string name="screen_live_room_donation_plus_10000">+10000</string>
<string name="screen_live_room_cancel">キャンセル</string>
<string name="screen_live_room_password_title">パスワード入力</string>
<string name="screen_live_room_password_description">非公開ライブの入場パスワードを入力してください。</string>
<string name="screen_live_room_password_label">パスワード</string>
<string name="screen_live_room_password_hint">パスワードを入力してください</string>
<string name="screen_live_room_enter_with_amount_suffix">で入場</string>
<string name="screen_live_room_enter">入場する</string>
<string name="screen_live_room_profile_edit_title">ライブ修正</string>
<string name="screen_live_room_title_label">タイトル</string>
<string name="screen_live_room_title_hint">ライブタイトルを入力してください。</string>
<string name="screen_live_room_notice_hint">ライブ告知を入力してください</string>
<string name="screen_live_room_age_limit_label">年齢制限</string>
<string name="screen_live_room_age_limit_adult">19歳以上</string>
<string name="screen_live_room_menu_label_title">メニュー</string>
<string name="screen_live_room_menu_activate_question">メニューを有効にしますか？</string>
<string name="screen_live_room_menu_preset_1">メニュー1</string>
<string name="screen_live_room_menu_preset_2">メニュー2</string>
<string name="screen_live_room_menu_preset_3">メニュー3</string>
<string name="screen_live_room_menu_hint">メニュー表を作成してください。</string>
<string name="screen_live_room_entry_message_label">入場メッセージ</string>
<string name="screen_live_room_update_action">修正する</string>
<string name="screen_live_room_menu_first_required">メニュー1を先に設定してください</string>
<string name="screen_live_room_menu_first_second_required">メニュー1とメニュー2を先に設定してください</string>
<string name="screen_live_room_cancel_reason_required">キャンセル理由を入力してください。</string>
<string name="screen_my_notice_more">詳細</string>
<string name="screen_my_login">ログイン</string>
<string name="screen_my_edit_profile">プロフィール編集</string>

47
app/src/main/res/values/strings.xml
View File

@@ -435,6 +435,53 @@
<string name="screen_live_room_dialog_title_no_chat">채팅금지</string>
<string name="screen_live_room_dialog_no_chat_desc">3분간 채팅금지를 하겠습니까?</string>
<string name="screen_live_room_dialog_skip">건너뛰기</string>
<string name="screen_live_room_age_badge">19</string>
<string name="screen_live_room_heart_ranking_title">현재 라이브 하트랭킹</string>
<string name="screen_live_room_total_label">합계</string>
<string name="screen_live_room_total_count_label">전체</string>
<string name="screen_live_room_people_unit">명</string>
<string name="screen_live_room_donation_ranking_title">현재 라이브 후원랭킹</string>
<string name="screen_live_room_donation_normal_label">일반</string>
<string name="screen_live_room_donation_secret_label">비밀</string>
<string name="screen_live_room_parenthesis_open">(</string>
<string name="screen_live_room_parenthesis_close">)</string>
<string name="screen_live_room_separator_slash">/</string>
<string name="screen_live_room_profile_title">프로필</string>
<string name="screen_live_room_no_chatting_three_minutes">3분간 채팅금지</string>
<string name="screen_live_room_donation_history_title">후원 히스토리</string>
<string name="screen_live_room_donation_history_empty">후원 히스토리가 없습니다.</string>
<string name="screen_live_room_close">닫기</string>
<string name="screen_live_room_donation_title">후원하기</string>
<string name="screen_live_room_charge">충전</string>
<string name="screen_live_room_secret_mission">비밀미션</string>
<string name="screen_live_room_donation_plus_10">+10</string>
<string name="screen_live_room_donation_plus_100">+100</string>
<string name="screen_live_room_donation_plus_1000">+1000</string>
<string name="screen_live_room_donation_plus_10000">+10000</string>
<string name="screen_live_room_cancel">취소</string>
<string name="screen_live_room_password_title">비밀번호 입력</string>
<string name="screen_live_room_password_description">비공개 라이브의 입장 비밀번호를\n입력해 주세요.</string>
<string name="screen_live_room_password_label">비밀번호</string>
<string name="screen_live_room_password_hint">비밀번호를 입력해 주세요</string>
<string name="screen_live_room_enter_with_amount_suffix">으로 입장</string>
<string name="screen_live_room_enter">입장하기</string>
<string name="screen_live_room_profile_edit_title">라이브 수정</string>
<string name="screen_live_room_title_label">제목</string>
<string name="screen_live_room_title_hint">라이브 제목을 입력해주세요.</string>
<string name="screen_live_room_notice_hint">라이브 공지를 입력해 주세요</string>
<string name="screen_live_room_age_limit_label">연령제한</string>
<string name="screen_live_room_age_limit_adult">19세 이상</string>
<string name="screen_live_room_menu_label_title">메뉴</string>
<string name="screen_live_room_menu_activate_question">메뉴를 활성화 하시겠습니까?</string>
<string name="screen_live_room_menu_preset_1">메뉴 1</string>
<string name="screen_live_room_menu_preset_2">메뉴 2</string>
<string name="screen_live_room_menu_preset_3">메뉴 3</string>
<string name="screen_live_room_menu_hint">메뉴판을 작성해주세요.</string>
<string name="screen_live_room_entry_message_label">입장 메시지</string>
<string name="screen_live_room_update_action">수정하기</string>
<string name="screen_live_room_menu_first_required">메뉴 1을 먼저 설정하세요</string>
<string name="screen_live_room_menu_first_second_required">메뉴 1과 메뉴 2를 먼저 설정하세요</string>
<string name="screen_live_room_cancel_reason_required">취소사유를 입력하세요.</string>
<string name="screen_my_notice_more">자세히</string>
<string name="screen_my_login">LOGIN</string>
<string name="screen_my_edit_profile">프로필 수정</string>