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

feat(creator): 오디오 탭 activity 연동을 추가한다

Browse Source
This commit is contained in:
klaus
2026-06-19 21:04:08 +09:00
parent bcbc48540e
commit 757f242285
3 changed files with 148 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt
View File

@@ -54,6 +54,7 @@ import kr.co.vividnext.sodalive.v2.creator.channel.data.CreatorChannelAudioConte
import kr.co.vividnext.sodalive.v2.creator.channel.data.CreatorChannelLiveResponse
import kr.co.vividnext.sodalive.v2.creator.channel.data.CreatorChannelScheduleResponse
import kr.co.vividnext.sodalive.v2.creator.channel.data.CreatorChannelSeriesResponse
import kr.co.vividnext.sodalive.v2.creator.channel.audio.CreatorChannelAudioFragment
import kr.co.vividnext.sodalive.v2.creator.channel.live.CreatorChannelLiveFragment
import kr.co.vividnext.sodalive.v2.creator.channel.model.CreatorChannelHeaderUiModel
import kr.co.vividnext.sodalive.v2.creator.channel.model.CreatorChannelScrollState
@@ -68,7 +69,8 @@ import org.koin.android.ext.android.inject
class CreatorChannelActivity :
BaseActivity<ActivityCreatorChannelBinding>(ActivityCreatorChannelBinding::inflate),
CreatorChannelHomeFragment.Host,
CreatorChannelLiveFragment.Host {
CreatorChannelLiveFragment.Host,
CreatorChannelAudioFragment.Host {
private val liveViewModel: LiveViewModel by inject()
private val myPageViewModel: MyPageViewModel by inject()
@@ -129,7 +131,7 @@ class CreatorChannelActivity :
setStatusBarIconAppearance()
setTitleBarTopInset()
setupOwnerFabInsets()
setupLiveOwnerCtaInsets()
setupOwnerCtaInsets()
setupScrollListener()
setupClickListeners()
setupLiveEntryObservers()
@@ -160,7 +162,7 @@ class CreatorChannelActivity :
binding.ownerFabCommunityButton.setOnClickListener { onOwnerFabCommunityClicked() }
binding.ownerFabAudioButton.setOnClickListener { onOwnerFabAudioClicked() }
binding.ownerFabLiveButton.setOnClickListener { onOwnerFabLiveClicked() }
binding.btnCreatorChannelLiveOwnerCta.setOnClickListener { onLiveOwnerCtaClicked() }
binding.btnCreatorChannelOwnerCta.setOnClickListener { onOwnerCtaClicked() }
binding.tvChatButton.setOnClickListener {
currentHeader?.characterId?.let { characterId -> homeActionDelegate?.createChatRoom(characterId) }
}
@@ -273,18 +275,18 @@ class CreatorChannelActivity :
}
private fun onCreatorChannelNestedScrollChanged(scrollY: Int, oldScrollY: Int) {
if (binding.viewPager.currentItem != CreatorChannelTab.Live.ordinal) return
if (!isCreatorChannelLoadMoreTab(binding.viewPager.currentItem)) return
if (scrollY <= oldScrollY) return
val contentHeight = binding.nestedScrollView.getChildAt(0)?.height ?: return
val threshold = CREATOR_CHANNEL_LIVE_LOAD_MORE_THRESHOLD_DP.dpToPx().toInt()
val remainingScroll = calculateCreatorChannelLiveRemainingScroll(
val threshold = CREATOR_CHANNEL_LOAD_MORE_THRESHOLD_DP.dpToPx().toInt()
val remainingScroll = calculateCreatorChannelRemainingScroll(
contentHeight = contentHeight,
viewportHeight = binding.nestedScrollView.height,
scrollY = scrollY
)
if (remainingScroll <= threshold) {
findLiveFragment()?.onCreatorChannelLiveScrolledToBottom()
notifyCurrentCreatorChannelTabScrolledToBottom()
}
}
@@ -390,13 +392,16 @@ class CreatorChannelActivity :
collapseOwnerFab(animate = false)
}
updateOwnerFabVisibility()
updateLiveOwnerCtaVisibility()
updateCreatorChannelLiveViewportHeight()
updateOwnerCtaVisibility()
updateCreatorChannelTabViewportHeight()
updateViewPagerHeight()
if (position == CreatorChannelTab.Live.ordinal) {
binding.viewPager.post {
when (position) {
CreatorChannelTab.Live.ordinal -> binding.viewPager.post {
findLiveFragment()?.onCreatorChannelLiveTabSelected()
}
CreatorChannelTab.Audio.ordinal -> binding.viewPager.post {
findAudioFragment()?.onCreatorChannelAudioTabSelected()
}
}
}
}
@@ -409,7 +414,12 @@ class CreatorChannelActivity :
bindHeader(header)
bindTitleBar(header)
updateOwnerFabVisibility()
updateLiveOwnerCtaVisibility()
updateOwnerCtaVisibility()
if (binding.viewPager.currentItem == CreatorChannelTab.Audio.ordinal) {
binding.viewPager.post {
findAudioFragment()?.onCreatorChannelAudioTabSelected()
}
}
}
override fun onCreatorChannelFollowProgressChanged(inProgress: Boolean) {
@@ -444,28 +454,63 @@ class CreatorChannelActivity :
}
override fun onCreatorChannelLiveContentChanged() {
updateCreatorChannelLiveViewportHeight()
updateCreatorChannelTabViewportHeight()
updateViewPagerHeight()
postCheckCreatorChannelLiveNeedsMore()
postCheckCreatorChannelCurrentTabNeedsMore()
}
override fun isCreatorChannelOwner(): Boolean = currentHeader?.isOwner == true
override fun onCreatorChannelAudioContentClicked(audioContentId: Long) {
startAudioContentDetail(audioContentId)
}
override fun onCreatorChannelAudioContentChanged() {
updateCreatorChannelTabViewportHeight()
updateViewPagerHeight()
postCheckCreatorChannelCurrentTabNeedsMore()
}
private fun setupOwnerFabInsets() {
binding.viewPager.updatePadding(bottom = OWNER_FAB_CONTENT_BOTTOM_PADDING_DP.dpToPx().toInt())
}
private fun setupLiveOwnerCtaInsets() {
updateLiveOwnerCtaVisibility()
private fun setupOwnerCtaInsets() {
updateOwnerCtaVisibility()
}
private fun updateLiveOwnerCtaVisibility() {
val shouldShowLiveOwnerCta = shouldShowLiveOwnerCta()
binding.layoutCreatorChannelLiveOwnerCta.isVisible = shouldShowLiveOwnerCta
binding.btnCreatorChannelLiveOwnerCta.isEnabled = true
findLiveFragment()?.onCreatorChannelLiveOwnerCtaVisibilityChanged(shouldShowLiveOwnerCta)
private fun updateOwnerCtaVisibility() {
val ownerCtaTab = currentOwnerCtaTab()
val shouldShowOwnerCta = ownerCtaTab != null
binding.layoutCreatorChannelOwnerCta.isVisible = shouldShowOwnerCta
binding.btnCreatorChannelOwnerCta.isEnabled = true
when (ownerCtaTab) {
CreatorChannelTab.Live -> bindOwnerCta(
iconResId = R.drawable.ic_new_create_live,
textResId = R.string.creator_channel_live_start_button
)
CreatorChannelTab.Audio -> bindOwnerCta(
iconResId = R.drawable.ic_new_upload_audio,
textResId = R.string.creator_channel_audio_upload_button
)
else -> Unit
}
findLiveFragment()?.onCreatorChannelLiveOwnerCtaVisibilityChanged(ownerCtaTab == CreatorChannelTab.Live)
findAudioFragment()?.onCreatorChannelAudioOwnerCtaVisibilityChanged(ownerCtaTab == CreatorChannelTab.Audio)
}
private fun shouldShowLiveOwnerCta(): Boolean {
return currentHeader?.isOwner == true && binding.viewPager.currentItem == CreatorChannelTab.Live.ordinal
private fun bindOwnerCta(iconResId: Int, textResId: Int) {
binding.ivCreatorChannelOwnerCta.setImageResource(iconResId)
binding.tvCreatorChannelOwnerCta.setText(textResId)
}
private fun currentOwnerCtaTab(): CreatorChannelTab? {
if (currentHeader?.isOwner != true) return null
return when (binding.viewPager.currentItem) {
CreatorChannelTab.Live.ordinal -> CreatorChannelTab.Live
CreatorChannelTab.Audio.ordinal -> CreatorChannelTab.Audio
else -> null
}
}
private fun expandOwnerFab() {
@@ -556,9 +601,12 @@ class CreatorChannelActivity :
liveRoomCreateLauncher.launch(Intent(this, LiveRoomCreateActivity::class.java))
}
private fun onLiveOwnerCtaClicked() {
binding.btnCreatorChannelLiveOwnerCta.isEnabled = false
onOwnerFabLiveClicked()
private fun onOwnerCtaClicked() {
binding.btnCreatorChannelOwnerCta.isEnabled = false
when (binding.viewPager.currentItem) {
CreatorChannelTab.Live.ordinal -> onOwnerFabLiveClicked()
CreatorChannelTab.Audio.ordinal -> onOwnerFabAudioClicked()
}
}
override fun onCreatorChannelDonationClicked() {
@@ -593,6 +641,22 @@ class CreatorChannelActivity :
return supportFragmentManager.findFragmentByTag(fragmentTag) as? CreatorChannelLiveFragment
}
private fun findAudioFragment(): CreatorChannelAudioFragment? {
val fragmentTag = "f${CreatorChannelTab.Audio.ordinal}"
return supportFragmentManager.findFragmentByTag(fragmentTag) as? CreatorChannelAudioFragment
}
private fun notifyCurrentCreatorChannelTabScrolledToBottom() {
when (binding.viewPager.currentItem) {
CreatorChannelTab.Live.ordinal -> findLiveFragment()?.onCreatorChannelLiveScrolledToBottom()
CreatorChannelTab.Audio.ordinal -> findAudioFragment()?.onCreatorChannelAudioScrolledToBottom()
}
}
private fun isCreatorChannelLoadMoreTab(position: Int): Boolean {
return position == CreatorChannelTab.Live.ordinal || position == CreatorChannelTab.Audio.ordinal
}
private fun ensureLoginAndAdultAuth(isAdult: Boolean, onAuthed: () -> Unit) {
if (SharedPreferenceManager.token.isBlank()) {
showLoginActivity()
@@ -659,7 +723,7 @@ class CreatorChannelActivity :
}
private fun updateViewPagerHeight() {
updateCreatorChannelLiveViewportHeight()
updateCreatorChannelTabViewportHeight()
binding.viewPager.post {
val recyclerView = binding.viewPager.getChildAt(0) as? RecyclerView ?: return@post
val currentPage = recyclerView.layoutManager?.findViewByPosition(binding.viewPager.currentItem) ?: return@post
@@ -675,15 +739,15 @@ class CreatorChannelActivity :
}
}
private fun updateCreatorChannelLiveViewportHeight() {
if (binding.viewPager.currentItem != CreatorChannelTab.Live.ordinal) return
findLiveFragment()?.onCreatorChannelLiveViewportHeightChanged(
calculateCreatorChannelLiveEmptyMinHeight()
)
private fun updateCreatorChannelTabViewportHeight() {
val minHeight = calculateCreatorChannelTabEmptyMinHeight()
when (binding.viewPager.currentItem) {
CreatorChannelTab.Live.ordinal -> findLiveFragment()?.onCreatorChannelLiveViewportHeightChanged(minHeight)
CreatorChannelTab.Audio.ordinal -> findAudioFragment()?.onCreatorChannelAudioViewportHeightChanged(minHeight)
}
}
private fun calculateCreatorChannelLiveEmptyMinHeight(): Int {
private fun calculateCreatorChannelTabEmptyMinHeight(): Int {
val stickyScrollY = calculateCreatorChannelStickyScrollY()
val visibleTabViewportHeight = binding.nestedScrollView.height - binding.tabLayout.height
val scrollRangeRequiredHeight = binding.nestedScrollView.height +
@@ -692,23 +756,23 @@ class CreatorChannelActivity :
return maxOf(visibleTabViewportHeight, scrollRangeRequiredHeight, 0)
}
private fun postCheckCreatorChannelLiveNeedsMore() {
private fun postCheckCreatorChannelCurrentTabNeedsMore() {
binding.nestedScrollView.post {
checkCreatorChannelLiveNeedsMore()
checkCreatorChannelCurrentTabNeedsMore()
}
}
private fun checkCreatorChannelLiveNeedsMore() {
if (binding.viewPager.currentItem != CreatorChannelTab.Live.ordinal) return
private fun checkCreatorChannelCurrentTabNeedsMore() {
if (!isCreatorChannelLoadMoreTab(binding.viewPager.currentItem)) return
val contentHeight = binding.nestedScrollView.getChildAt(0)?.height ?: return
val remainingScroll = calculateCreatorChannelLiveRemainingScroll(
val remainingScroll = calculateCreatorChannelRemainingScroll(
contentHeight = contentHeight,
viewportHeight = binding.nestedScrollView.height,
scrollY = binding.nestedScrollView.scrollY
)
if (remainingScroll <= 0) {
findLiveFragment()?.onCreatorChannelLiveScrolledToBottom()
notifyCurrentCreatorChannelTabScrolledToBottom()
}
}
@@ -749,7 +813,7 @@ class CreatorChannelActivity :
override fun onResume() {
super.onResume()
binding.btnCreatorChannelLiveOwnerCta.isEnabled = true
binding.btnCreatorChannelOwnerCta.isEnabled = true
}
override fun onDestroy() {
@@ -787,7 +851,7 @@ class CreatorChannelActivity :
private const val OWNER_FAB_SPRING_MASS = 1f
private const val OWNER_FAB_SPRING_STIFFNESS = 256f
private const val OWNER_FAB_SPRING_DAMPING = 24f
private const val CREATOR_CHANNEL_LIVE_LOAD_MORE_THRESHOLD_DP = 200
private const val CREATOR_CHANNEL_LOAD_MORE_THRESHOLD_DP = 200
fun newIntent(context: Context, creatorId: Long): Intent {
return Intent(context, CreatorChannelActivity::class.java).apply {
@@ -797,7 +861,7 @@ class CreatorChannelActivity :
}
}
internal fun calculateCreatorChannelLiveRemainingScroll(
internal fun calculateCreatorChannelRemainingScroll(
contentHeight: Int,
viewportHeight: Int,
scrollY: Int

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

@@ -239,7 +239,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
android:id="@+id/layout_creator_channel_live_owner_cta"
android:id="@+id/layout_creator_channel_owner_cta"
android:layout_width="0dp"
android:layout_height="100dp"
android:background="@color/black"
@@ -249,7 +249,7 @@
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:id="@+id/btn_creator_channel_live_owner_cta"
android:id="@+id/btn_creator_channel_owner_cta"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginHorizontal="@dimen/spacing_14"
@@ -261,12 +261,14 @@
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_creator_channel_owner_cta"
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@null"
android:src="@drawable/ic_new_create_live" />
<TextView
android:id="@+id/tv_creator_channel_owner_cta"
style="@style/Typography.Heading3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"