From 23e8d5ce7a66ce0504cb88c73762a5efcadf9ee3 Mon Sep 17 00:00:00 2001 From: klaus Date: Thu, 1 Oct 2026 15:58:36 +0900 Subject: [PATCH] =?UTF-8?q?feat(creator):=20=EC=84=A0=EB=AC=BC=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=EC=A7=84=EC=9E=85=EC=A0=90=EC=9D=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creator/channel/CreatorChannelActivity.kt | 27 +++++++++++++++-- .../res/layout/activity_creator_channel.xml | 15 ++++++++++ .../CreatorChannelGiftEligibilityTest.kt | 28 ++++++++++++++++++ .../v2/gift/GiftSendEntryPolicyTest.kt | 29 +++++++++++++++++++ 4 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelGiftEligibilityTest.kt create mode 100644 app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendEntryPolicyTest.kt diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt index 7f1563cc..26e324b7 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt @@ -80,6 +80,7 @@ import kr.co.vividnext.sodalive.v2.creator.channel.model.CreatorChannelScrollSta import kr.co.vividnext.sodalive.v2.creator.channel.model.CreatorChannelTab import kr.co.vividnext.sodalive.v2.creator.channel.model.CreatorChannelTitleBarState import kr.co.vividnext.sodalive.v2.creator.channel.series.CreatorChannelSeriesFragment +import kr.co.vividnext.sodalive.v2.gift.GiftSendRequestActivity import kr.co.vividnext.sodalive.v2.live.action.LiveActionCoordinator import kr.co.vividnext.sodalive.v2.live.action.LiveCreationResult import kr.co.vividnext.sodalive.v2.live.action.resolveLiveCreationResult @@ -258,6 +259,17 @@ class CreatorChannelActivity : handleChatAction(ChatActionCommand.DmCreator(creatorId)) } } + binding.tvGiftSendButton.setOnClickListener { + val header = currentHeader ?: return@setOnClickListener + if (!canSendCreatorGift(header.isOwner, header.isDmAvailable)) return@setOnClickListener + startActivity( + GiftSendRequestActivity.newIntent( + context = this, + creatorMemberId = creatorId, + creatorNickname = header.nickname + ) + ) + } } private fun onFollowerCountClicked() { @@ -281,7 +293,8 @@ class CreatorChannelActivity : } updateActionButtonLayout( isChatVisible = !header.isOwner && header.isAiChatAvailable && header.characterId != null, - isDmVisible = header.isOwner || header.isDmAvailable + isDmVisible = header.isOwner || header.isDmAvailable, + isGiftVisible = canSendCreatorGift(header.isOwner, header.isDmAvailable) ) binding.tvDmButton.setText( if (header.isOwner) R.string.creator_channel_dm_check_button else R.string.creator_channel_dm_button @@ -426,12 +439,20 @@ class CreatorChannelActivity : WindowCompat.getInsetsController(window, binding.root).isAppearanceLightStatusBars = false } - private fun updateActionButtonLayout(isChatVisible: Boolean, isDmVisible: Boolean) { + private fun updateActionButtonLayout( + isChatVisible: Boolean, + isDmVisible: Boolean, + isGiftVisible: Boolean + ) { binding.tvChatButton.isVisible = isChatVisible binding.tvDmButton.isVisible = isDmVisible + binding.tvGiftSendButton.isVisible = isGiftVisible (binding.tvDmButton.layoutParams as LinearLayout.LayoutParams).apply { marginStart = if (isChatVisible && isDmVisible) 6.dpToPx().toInt() else 0 }.also(binding.tvDmButton::setLayoutParams) + (binding.tvGiftSendButton.layoutParams as LinearLayout.LayoutParams).apply { + marginStart = if ((isChatVisible || isDmVisible) && isGiftVisible) 6.dpToPx().toInt() else 0 + }.also(binding.tvGiftSendButton::setLayoutParams) } private fun onMoreClicked() { @@ -1329,3 +1350,5 @@ internal fun calculateCreatorChannelRemainingScroll( viewportHeight: Int, scrollY: Int ): Int = contentHeight - viewportHeight - scrollY + +internal fun canSendCreatorGift(isOwner: Boolean, isDmAvailable: Boolean): Boolean = !isOwner && isDmAvailable diff --git a/app/src/main/res/layout/activity_creator_channel.xml b/app/src/main/res/layout/activity_creator_channel.xml index f6a4f7ab..96d26363 100644 --- a/app/src/main/res/layout/activity_creator_channel.xml +++ b/app/src/main/res/layout/activity_creator_channel.xml @@ -114,6 +114,21 @@ android:visibility="gone" app:drawableStartCompat="@drawable/ic_new_dm" tools:visibility="visible" /> + + diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelGiftEligibilityTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelGiftEligibilityTest.kt new file mode 100644 index 00000000..f6b7b18e --- /dev/null +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelGiftEligibilityTest.kt @@ -0,0 +1,28 @@ +package kr.co.vividnext.sodalive.v2.creator.channel + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class CreatorChannelGiftEligibilityTest { + + @Test + fun `비소유자이고 DM 가능이면 선물 보내기 버튼을 표시한다`() { + assertTrue(canSendCreatorGift(isOwner = false, isDmAvailable = true)) + } + + @Test + fun `비소유자라도 DM 불가이면 선물 보내기 버튼을 숨긴다`() { + assertFalse(canSendCreatorGift(isOwner = false, isDmAvailable = false)) + } + + @Test + fun `소유자는 DM 가능 상태여도 선물 보내기 버튼을 숨긴다`() { + assertFalse(canSendCreatorGift(isOwner = true, isDmAvailable = true)) + } + + @Test + fun `소유자이고 DM 불가이면 선물 보내기 버튼을 숨긴다`() { + assertFalse(canSendCreatorGift(isOwner = true, isDmAvailable = false)) + } +} diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendEntryPolicyTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendEntryPolicyTest.kt new file mode 100644 index 00000000..b69b2809 --- /dev/null +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/gift/GiftSendEntryPolicyTest.kt @@ -0,0 +1,29 @@ +package kr.co.vividnext.sodalive.v2.gift + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertNotNull +import org.junit.Test + +class GiftSendEntryPolicyTest { + + @Test + fun `회원번호가 0 이하이면 진입 정보가 거부된다`() { + assertNull(GiftSendRequestPresenter.toValidEntry(0L, "크리에이터")) + assertNull(GiftSendRequestPresenter.toValidEntry(-1L, "크리에이터")) + } + + @Test + fun `닉네임이 비어 있거나 공백이면 진입 정보가 거부된다`() { + assertNull(GiftSendRequestPresenter.toValidEntry(1L, "")) + assertNull(GiftSendRequestPresenter.toValidEntry(1L, " ")) + } + + @Test + fun `유효한 회원번호와 닉네임이면 진입 정보를 반환한다`() { + val entry = GiftSendRequestPresenter.toValidEntry(1L, "크리에이터") + + assertNotNull(entry) + assertEquals(GiftSendEntry(1L, "크리에이터"), entry) + } +}