diff --git a/app/build.gradle b/app/build.gradle index d9b53f0f..0a6281d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,8 +63,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 35 - versionCode 227 - versionName "1.52.1" + versionCode 229 + versionName "1.53.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } 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 03c88577..2ec456d9 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 @@ -275,27 +275,13 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } private fun updateChatFreezeToggleUi() { - if (isChatFrozen) { - binding.tvChatFreezeSwitch.text = getString(R.string.screen_live_room_chat_freeze_on_label) - binding.tvChatFreezeSwitch.setTextColor( - ContextCompat.getColor( - applicationContext, - R.color.color_3bb9f1 - ) - ) - binding.tvChatFreezeSwitch - .setBackgroundResource(R.drawable.bg_round_corner_5_3_transparent_3bb9f1) - } else { - binding.tvChatFreezeSwitch.text = getString(R.string.screen_live_room_chat_freeze_off_label) - binding.tvChatFreezeSwitch.setTextColor( - ContextCompat.getColor( - applicationContext, - R.color.color_eeeeee - ) - ) - binding.tvChatFreezeSwitch - .setBackgroundResource(R.drawable.bg_round_corner_5_3_transparent_bbbbbb) - } + binding.tvChatFreezeSwitch.setBackgroundResource( + if (isChatFrozen) { + R.drawable.bg_round_corner_10_803bb9f1 + } else { + R.drawable.bg_round_corner_10_99525252 + } + ) } private fun showChatFreezeWarning() { @@ -306,15 +292,16 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB ).show() } - private fun buildChatFreezeStatusMessage(isFrozen: Boolean, actorNickname: String): String { - return getString( - if (isFrozen) { - R.string.screen_live_room_chat_freeze_started + private fun buildChatFreezeStatusMessage(isFrozen: Boolean, isForHost: Boolean): String { + return if (isFrozen) { + if (isForHost) { + "โ€œ๐ŸงŠ ๋ชจ๋‘๋“ค ์–ผ์Œ!โ€ ์ฑ„ํŒ…์ฐฝ์„ ์–ผ๋ ธ์Šต๋‹ˆ๋‹ค." } else { - R.string.screen_live_room_chat_freeze_ended - }, - actorNickname - ) + "โ€œ๐ŸงŠ ๋ชจ๋‘๋“ค ์–ผ์Œ!โ€ ์ฑ„ํŒ…์ฐฝ์ด ์–ผ์—ˆ์Šต๋‹ˆ๋‹ค." + } + } else { + "โ€œ๐Ÿ’ง๋•ก! โ€œ ์ฑ„ํŒ…์ฐฝ ์–ผ๋ฆฌ๊ธฐ๊ฐ€ ํ•ด์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค." + } } private fun addChatFreezeStatusMessage(message: String) { @@ -338,7 +325,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB val noticeMessage = buildChatFreezeStatusMessage( isFrozen = nextChatFrozen, - actorNickname = SharedPreferenceManager.nickname + isForHost = true ) addChatFreezeStatusMessage(noticeMessage) @@ -347,7 +334,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB rawMessage = Gson().toJson( LiveRoomChatRawMessage( type = LiveRoomChatRawMessageType.TOGGLE_CHAT_FREEZE, - message = noticeMessage, + message = "", can = 0, donationMessage = "", isChatFrozen = nextChatFrozen @@ -1245,7 +1232,10 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB if (!isHost && response.isChatFrozen && !hasShownInitialChatFreezeNotice) { addChatFreezeStatusMessage( - getString(R.string.screen_live_room_chat_freeze_started) + buildChatFreezeStatusMessage( + isFrozen = true, + isForHost = false + ) ) hasShownInitialChatFreezeNotice = true } @@ -2342,16 +2332,10 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB val frozen = message.isChatFrozen ?: false setChatFrozenState(frozen) - val statusMessage = if (message.message.isNotBlank()) { - message.message - } else { - buildChatFreezeStatusMessage( - isFrozen = frozen, - actorNickname = nickname.ifBlank { - viewModel.getManagerNickname() - } - ) - } + val statusMessage = buildChatFreezeStatusMessage( + isFrozen = frozen, + isForHost = false + ) addChatFreezeStatusMessage(statusMessage) } diff --git a/app/src/main/res/drawable-xxxhdpi/ic_ice.png b/app/src/main/res/drawable-xxxhdpi/ic_ice.png new file mode 100644 index 00000000..649c00ff Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_ice.png differ diff --git a/app/src/main/res/drawable/bg_round_corner_10_803bb9f1.xml b/app/src/main/res/drawable/bg_round_corner_10_803bb9f1.xml new file mode 100644 index 00000000..5d83efc5 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_10_803bb9f1.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index 5bccd907..cf26d698 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -268,22 +268,6 @@ android:visibility="gone" tools:ignore="SmallSp" /> - - + + + + +