refactor(content): 상세 진입을 공통 액션으로 통합한다

This commit is contained in:
2026-07-14 22:11:10 +09:00
parent 1c5fbb38f1
commit fe79431744
23 changed files with 578 additions and 208 deletions
@@ -0,0 +1,46 @@
package kr.co.vividnext.sodalive.v2.content.action
import kr.co.vividnext.sodalive.v2.access.AccessRequirement
class ContentAction {
fun execute(
command: ContentActionCommand,
ensureAccess: (AccessRequirement) -> Boolean
): ContentActionResult {
val isValidId = when (command) {
is ContentActionCommand.AudioDetail -> command.audioContentId > 0L
is ContentActionCommand.SeriesDetail -> command.seriesId > 0L
}
if (!isValidId) return ContentActionResult.Ignored
val requiresAdultContentAccess = when (command) {
is ContentActionCommand.AudioDetail -> command.requiresAdultContentAccess
is ContentActionCommand.SeriesDetail -> command.requiresAdultContentAccess
}
val requirement = AccessRequirement.forAdultContent(requiresAdultContentAccess)
if (!ensureAccess(requirement)) return ContentActionResult.Blocked(requirement)
return when (command) {
is ContentActionCommand.AudioDetail ->
ContentActionResult.NavigateToAudioDetail(command.audioContentId)
is ContentActionCommand.SeriesDetail ->
ContentActionResult.NavigateToSeriesDetail(command.seriesId)
}
}
}
sealed interface ContentActionResult {
data object Ignored : ContentActionResult
data class Blocked(
val requirement: AccessRequirement
) : ContentActionResult
data class NavigateToAudioDetail(
val audioContentId: Long
) : ContentActionResult
data class NavigateToSeriesDetail(
val seriesId: Long
) : ContentActionResult
}
@@ -0,0 +1,13 @@
package kr.co.vividnext.sodalive.v2.content.action
sealed interface ContentActionCommand {
data class AudioDetail(
val audioContentId: Long,
val requiresAdultContentAccess: Boolean = false
) : ContentActionCommand
data class SeriesDetail(
val seriesId: Long,
val requiresAdultContentAccess: Boolean = false
) : ContentActionCommand
}
@@ -0,0 +1,46 @@
package kr.co.vividnext.sodalive.v2.content.action
import android.app.Activity
import android.content.Context
import android.content.Intent
import androidx.fragment.app.Fragment
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
import kr.co.vividnext.sodalive.common.Constants
import kr.co.vividnext.sodalive.v2.access.AccessRequirement
import kr.co.vividnext.sodalive.v2.access.ensureV2Access
internal class ContentActionHandler(
private val action: ContentAction = ContentAction()
) {
fun handle(
context: Context,
command: ContentActionCommand,
ensureAccess: (AccessRequirement) -> Boolean
): ContentActionResult {
val result = action.execute(command, ensureAccess)
when (result) {
is ContentActionResult.NavigateToAudioDetail -> context.startActivity(
Intent(context, AudioContentDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, result.audioContentId)
}
)
is ContentActionResult.NavigateToSeriesDetail -> context.startActivity(
Intent(context, SeriesDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_SERIES_ID, result.seriesId)
}
)
is ContentActionResult.Blocked,
ContentActionResult.Ignored -> Unit
}
return result
}
}
fun Activity.handleContentAction(command: ContentActionCommand): ContentActionResult {
return ContentActionHandler().handle(this, command, ::ensureV2Access)
}
fun Fragment.handleContentAction(command: ContentActionCommand): ContentActionResult {
return ContentActionHandler().handle(requireContext(), command, ::ensureV2Access)
}
@@ -25,8 +25,6 @@ import com.google.gson.Gson
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
import kr.co.vividnext.sodalive.audio_content.upload.AudioContentUploadActivity
import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomActivity
@@ -49,6 +47,8 @@ import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationDialog
import kr.co.vividnext.sodalive.report.UserReportDialog
import kr.co.vividnext.sodalive.v2.access.AccessRequirement
import kr.co.vividnext.sodalive.v2.access.ensureV2Access
import kr.co.vividnext.sodalive.v2.content.action.ContentActionCommand
import kr.co.vividnext.sodalive.v2.content.action.handleContentAction
import kr.co.vividnext.sodalive.v2.components.modal.V2ModalDialog
import kr.co.vividnext.sodalive.v2.common.CreatorActivityType
import kr.co.vividnext.sodalive.v2.creator.channel.audio.CreatorChannelAudioFragment
@@ -561,8 +561,11 @@ class CreatorChannelActivity :
override fun isCreatorChannelOwner(): Boolean = currentHeader?.isOwner == true
override fun onCreatorChannelAudioContentClicked(audioContentId: Long) {
startAudioContentDetail(audioContentId)
override fun onCreatorChannelAudioContentClicked(
audioContentId: Long,
requiresAdultContentAccess: Boolean
) {
openAudioContentDetail(audioContentId, requiresAdultContentAccess)
}
override fun onCreatorChannelAudioContentChanged() {
@@ -572,12 +575,11 @@ class CreatorChannelActivity :
}
}
override fun onCreatorChannelSeriesClicked(seriesId: Long) {
startActivity(
Intent(this, SeriesDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_SERIES_ID, seriesId)
}
)
override fun onCreatorChannelSeriesClicked(
seriesId: Long,
requiresAdultContentAccess: Boolean
) {
openSeriesDetail(seriesId, requiresAdultContentAccess)
}
override fun onCreatorChannelSeriesContentChanged() {
@@ -964,8 +966,11 @@ class CreatorChannelActivity :
}
}
override fun onCreatorChannelLiveReplayClicked(audioContentId: Long) {
startAudioContentDetail(audioContentId)
override fun onCreatorChannelLiveReplayClicked(
audioContentId: Long,
requiresAdultContentAccess: Boolean
) {
openAudioContentDetail(audioContentId, requiresAdultContentAccess)
}
private fun findLiveFragment(): CreatorChannelLiveFragment? {
@@ -1086,11 +1091,7 @@ class CreatorChannelActivity :
private fun onScheduleClicked(schedule: CreatorChannelScheduleResponse) {
when (schedule.type) {
CreatorActivityType.Audio,
CreatorActivityType.LiveReplay -> startActivity(
Intent(this, AudioContentDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, schedule.targetId)
}
)
CreatorActivityType.LiveReplay -> openAudioContentDetail(schedule.targetId)
CreatorActivityType.Live -> liveCoordinator.showLiveRoomDetail(schedule.targetId)
@@ -1099,22 +1100,34 @@ class CreatorChannelActivity :
}
private fun onAudioContentClicked(audioContent: CreatorChannelAudioContentResponse) {
startAudioContentDetail(audioContent.audioContentId)
openAudioContentDetail(audioContent.audioContentId, audioContent.isAdult)
}
private fun startAudioContentDetail(audioContentId: Long) {
startActivity(
Intent(this, AudioContentDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, audioContentId)
}
private fun openAudioContentDetail(
audioContentId: Long,
requiresAdultContentAccess: Boolean = false
) {
handleContentAction(
ContentActionCommand.AudioDetail(
audioContentId = audioContentId,
requiresAdultContentAccess = requiresAdultContentAccess
)
)
}
private fun onSeriesClicked(series: CreatorChannelSeriesResponse) {
startActivity(
Intent(this, SeriesDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_SERIES_ID, series.seriesId)
}
openSeriesDetail(series.seriesId)
}
private fun openSeriesDetail(
seriesId: Long,
requiresAdultContentAccess: Boolean = false
) {
handleContentAction(
ContentActionCommand.SeriesDetail(
seriesId = seriesId,
requiresAdultContentAccess = requiresAdultContentAccess
)
)
}
@@ -27,7 +27,7 @@ class CreatorChannelAudioFragment : BaseFragment<FragmentCreatorChannelAudioBind
private val viewModel: CreatorChannelAudioViewModel by viewModel()
private val audioContentAdapter = CreatorChannelAudioContentAdapter { item ->
host.onCreatorChannelAudioContentClicked(item.audioContentId)
host.onCreatorChannelAudioContentClicked(item.audioContentId, item.showAdultBadge)
}
private var sortPopup: CreatorChannelSortPopup? = null
private var currentContentState: CreatorChannelAudioUiState.Content? = null
@@ -238,7 +238,10 @@ class CreatorChannelAudioFragment : BaseFragment<FragmentCreatorChannelAudioBind
interface Host {
fun isCreatorChannelOwner(): Boolean
fun onCreatorChannelAudioContentClicked(audioContentId: Long)
fun onCreatorChannelAudioContentClicked(
audioContentId: Long,
requiresAdultContentAccess: Boolean
)
fun onCreatorChannelAudioContentChanged()
}
@@ -25,7 +25,7 @@ class CreatorChannelLiveFragment : BaseFragment<FragmentCreatorChannelLiveBindin
private val viewModel: CreatorChannelLiveViewModel by viewModel()
private val replayAdapter = CreatorChannelAudioContentAdapter { item ->
host.onCreatorChannelLiveReplayClicked(item.audioContentId)
host.onCreatorChannelLiveReplayClicked(item.audioContentId, item.showAdultBadge)
}
private var lastContentLayoutKey: CreatorChannelLiveContentLayoutKey? = null
private var sortPopup: CreatorChannelSortPopup? = null
@@ -189,7 +189,10 @@ class CreatorChannelLiveFragment : BaseFragment<FragmentCreatorChannelLiveBindin
interface Host {
fun onCreatorChannelCurrentLiveClicked(live: CreatorChannelLiveResponse)
fun onCreatorChannelLiveReplayClicked(audioContentId: Long)
fun onCreatorChannelLiveReplayClicked(
audioContentId: Long,
requiresAdultContentAccess: Boolean
)
fun onCreatorChannelLiveContentChanged()
}
@@ -19,8 +19,8 @@ class CreatorChannelSeriesFragment : BaseFragment<FragmentCreatorChannelSeriesBi
) {
private val viewModel: CreatorChannelSeriesViewModel by viewModel()
private val seriesAdapter = CreatorChannelSeriesAdapter { seriesId ->
host.onCreatorChannelSeriesClicked(seriesId)
private val seriesAdapter = CreatorChannelSeriesAdapter { item ->
host.onCreatorChannelSeriesClicked(item.seriesId, item.showAdultBadge)
}
private var sortPopup: CreatorChannelSortPopup? = null
private var currentContentState: CreatorChannelSeriesUiState.Content? = null
@@ -154,7 +154,10 @@ class CreatorChannelSeriesFragment : BaseFragment<FragmentCreatorChannelSeriesBi
interface Host {
fun isCreatorChannelOwner(): Boolean
fun onCreatorChannelSeriesClicked(seriesId: Long)
fun onCreatorChannelSeriesClicked(
seriesId: Long,
requiresAdultContentAccess: Boolean
)
fun onCreatorChannelSeriesContentChanged()
}
@@ -15,7 +15,7 @@ import kr.co.vividnext.sodalive.v2.creator.channel.series.model.CreatorChannelSe
import kr.co.vividnext.sodalive.v2.creator.channel.series.model.CreatorChannelSeriesSubtitleUiModel
class CreatorChannelSeriesAdapter(
private val onSeriesClicked: (Long) -> Unit = {}
private val onSeriesClicked: (CreatorChannelSeriesItemUiModel) -> Unit = {}
) : RecyclerView.Adapter<CreatorChannelSeriesAdapter.ViewHolder>() {
private var items: List<CreatorChannelSeriesItemUiModel> = emptyList()
@@ -40,7 +40,7 @@ class CreatorChannelSeriesAdapter(
class ViewHolder(
private val binding: ItemCreatorChannelSeriesBinding,
private val onSeriesClicked: (Long) -> Unit
private val onSeriesClicked: (CreatorChannelSeriesItemUiModel) -> Unit
) : RecyclerView.ViewHolder(binding.root) {
init {
@@ -65,7 +65,7 @@ class CreatorChannelSeriesAdapter(
tvCreatorChannelSeriesTitle.text = item.title
tvCreatorChannelSeriesSubtitle.text = formatSubtitle(item.subtitle)
bindProgress(item)
root.setOnClickListener { onSeriesClicked(item.seriesId) }
root.setOnClickListener { onSeriesClicked(item) }
}
private fun formatSubtitle(subtitle: CreatorChannelSeriesSubtitleUiModel): String {
@@ -14,10 +14,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.audio_content.box.AudioContentBoxActivity
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
import kr.co.vividnext.sodalive.base.BaseFragment
import kr.co.vividnext.sodalive.common.Constants
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.common.ToastMessage
import kr.co.vividnext.sodalive.databinding.FragmentV2MainContentBinding
@@ -31,6 +28,8 @@ import kr.co.vividnext.sodalive.v2.creator.channel.ui.CreatorChannelSortPopup
import kr.co.vividnext.sodalive.v2.main.MainV2Activity
import kr.co.vividnext.sodalive.v2.access.AccessRequirement
import kr.co.vividnext.sodalive.v2.access.ensureV2Access
import kr.co.vividnext.sodalive.v2.content.action.ContentActionCommand
import kr.co.vividnext.sodalive.v2.content.action.handleContentAction
import kr.co.vividnext.sodalive.v2.main.content.data.AudioRankingType
import kr.co.vividnext.sodalive.v2.main.content.data.MainContentAllType
import kr.co.vividnext.sodalive.v2.main.content.model.AudioRankingsUiState
@@ -38,6 +37,7 @@ import kr.co.vividnext.sodalive.v2.main.content.model.AudioRecommendationsUiStat
import kr.co.vividnext.sodalive.v2.main.content.model.ContentAudioCardSection
import kr.co.vividnext.sodalive.v2.main.content.model.ContentAudioCardUiModel
import kr.co.vividnext.sodalive.v2.main.content.model.ContentBannerSection
import kr.co.vividnext.sodalive.v2.main.content.model.ContentBannerRoute
import kr.co.vividnext.sodalive.v2.main.content.model.ContentBannerUiModel
import kr.co.vividnext.sodalive.v2.main.content.model.ContentCommentedAudioSection
import kr.co.vividnext.sodalive.v2.main.content.model.ContentCommentedAudioUiModel
@@ -616,8 +616,13 @@ class ContentMainFragment : BaseFragment<FragmentV2MainContentBinding>(
private fun onBannerClick(item: ContentBannerUiModel) {
val route = item.toContentBannerRoute() ?: return
ensureV2Access(AccessRequirement.Login) {
startActivity(route.toContentBannerIntent(requireContext()))
when (route) {
is ContentBannerRoute.Series -> handleContentAction(
ContentActionCommand.SeriesDetail(seriesId = route.seriesId)
)
else -> ensureV2Access(AccessRequirement.Login) {
route.toContentBannerIntent(requireContext())?.let(::startActivity)
}
}
}
@@ -645,38 +650,33 @@ class ContentMainFragment : BaseFragment<FragmentV2MainContentBinding>(
audioContentId: Long,
requiresAdultContentAccess: Boolean = false
) {
if (audioContentId <= 0L) return
ensureV2Access(AccessRequirement.forAdultContent(requiresAdultContentAccess)) {
startActivity(
Intent(requireContext(), AudioContentDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, audioContentId)
}
handleContentAction(
ContentActionCommand.AudioDetail(
audioContentId = audioContentId,
requiresAdultContentAccess = requiresAdultContentAccess
)
}
)
}
private fun openRankingAudioContentDetail(item: ContentRankingItem) {
val audioContentId = item.contentId.toLongOrNull()?.takeIf { it > 0L } ?: return
val audioContentId = item.contentId.toLongOrNull() ?: return
openAudioContentDetail(audioContentId)
}
private fun openSeriesDetail(item: ContentOriginalSeriesUiModel) {
val seriesId = item.seriesId.takeIf { it > 0L } ?: return
openSeriesDetail(seriesId)
openSeriesDetail(item.seriesId)
}
private fun openSeriesDetail(
seriesId: Long,
requiresAdultContentAccess: Boolean = false
) {
if (seriesId <= 0L) return
ensureV2Access(AccessRequirement.forAdultContent(requiresAdultContentAccess)) {
startActivity(
Intent(requireContext(), SeriesDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_SERIES_ID, seriesId)
}
handleContentAction(
ContentActionCommand.SeriesDetail(
seriesId = seriesId,
requiresAdultContentAccess = requiresAdultContentAccess
)
}
)
}
private fun findAllTabAudioAdultAccess(audioContentId: Long): Boolean {
@@ -4,7 +4,6 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import kr.co.vividnext.sodalive.BuildConfig
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
import kr.co.vividnext.sodalive.common.Constants
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
import kr.co.vividnext.sodalive.settings.event.EventItem
@@ -63,7 +62,7 @@ fun ContentBannerUiModel.toContentBannerRoute(): ContentBannerRoute? {
)
}
fun ContentBannerRoute.toContentBannerIntent(context: Context): Intent {
fun ContentBannerRoute.toContentBannerIntent(context: Context): Intent? {
return when (this) {
is ContentBannerRoute.Event -> Intent(context, EventDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_EVENT, eventItem)
@@ -71,9 +70,7 @@ fun ContentBannerRoute.toContentBannerIntent(context: Context): Intent {
is ContentBannerRoute.Creator -> CreatorChannelActivity.newIntent(context, creatorId)
is ContentBannerRoute.Series -> Intent(context, SeriesDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_SERIES_ID, seriesId)
}
is ContentBannerRoute.Series -> null
is ContentBannerRoute.Link -> Intent(Intent.ACTION_VIEW, Uri.parse(url))
}
@@ -8,11 +8,12 @@ import androidx.core.view.doOnLayout
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import kr.co.vividnext.sodalive.R
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.Constants
import kr.co.vividnext.sodalive.databinding.ActivityContentOverviewBinding
import kr.co.vividnext.sodalive.v2.content.action.ContentActionCommand
import kr.co.vividnext.sodalive.v2.content.action.handleContentAction
import kr.co.vividnext.sodalive.v2.main.content.overview.data.ContentOverviewType
import kr.co.vividnext.sodalive.v2.main.content.overview.model.ContentOverviewUiModel
import kr.co.vividnext.sodalive.v2.main.content.overview.model.ContentOverviewUiState
import kr.co.vividnext.sodalive.v2.main.content.overview.model.toTitleResId
import kr.co.vividnext.sodalive.v2.main.content.overview.ui.ContentOverviewAdapter
@@ -125,13 +126,12 @@ class ContentOverviewActivity : BaseActivity<ActivityContentOverviewBinding>(
?: toastMessage.resId?.let { resId -> showToast(getString(resId)) }
}
private fun openAudioContentDetail(contentId: Long) {
if (contentId <= 0) return
startActivity(
Intent(this, AudioContentDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, contentId)
}
private fun openAudioContentDetail(item: ContentOverviewUiModel) {
handleContentAction(
ContentActionCommand.AudioDetail(
audioContentId = item.contentId,
requiresAdultContentAccess = item.showAdultBadge
)
)
}
@@ -8,7 +8,7 @@ import kr.co.vividnext.sodalive.extensions.loadUrl
import kr.co.vividnext.sodalive.v2.main.content.overview.model.ContentOverviewUiModel
class ContentOverviewAdapter(
private val onContentClick: (Long) -> Unit = {}
private val onContentClick: (ContentOverviewUiModel) -> Unit = {}
) : RecyclerView.Adapter<ContentOverviewAdapter.ViewHolder>() {
private var items: List<ContentOverviewUiModel> = emptyList()
@@ -40,7 +40,7 @@ class ContentOverviewAdapter(
class ViewHolder(
private val binding: ItemContentAudioCardBinding,
private val onContentClick: (Long) -> Unit
private val onContentClick: (ContentOverviewUiModel) -> Unit
) : RecyclerView.ViewHolder(binding.root) {
fun bind(item: ContentOverviewUiModel, gridItemWidthPx: Int) = with(binding.audioContentCard.root) {
setGridItemWidthPx(gridItemWidthPx)
@@ -49,8 +49,7 @@ class ContentOverviewAdapter(
setAdultVisible(item.showAdultBadge)
thumbnailView().loadUrl(item.coverImage)
setOnClickListener {
if (item.contentId <= 0) return@setOnClickListener
onContentClick(item.contentId)
onContentClick(item)
}
}
}
@@ -26,6 +26,8 @@ import kr.co.vividnext.sodalive.v2.main.chat.model.ChatRoomListUiItem
import kr.co.vividnext.sodalive.v2.main.chat.model.ChatRoomType
import kr.co.vividnext.sodalive.v2.access.AccessRequirement
import kr.co.vividnext.sodalive.v2.access.ensureV2Access
import kr.co.vividnext.sodalive.v2.content.action.ContentActionCommand
import kr.co.vividnext.sodalive.v2.content.action.handleContentAction
import kr.co.vividnext.sodalive.v2.main.home.model.HomeFollowingChatSection
import kr.co.vividnext.sodalive.v2.main.home.model.HomeFollowingCreatorSection
import kr.co.vividnext.sodalive.v2.main.home.model.HomeFollowingLiveSection
@@ -39,6 +41,7 @@ import kr.co.vividnext.sodalive.v2.main.home.model.HomeCreatorRankingUiState
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationAiCharacterSection
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationAiCharacterUiModel
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationBannerSection
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationBannerRoute
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationBannerUiModel
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationCheerCreatorSection
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationGenreCreatorSection
@@ -48,13 +51,13 @@ import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationPopularComm
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationPopularCommunityPostUiModel
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationRecentDebutCreatorSection
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationRecentlyActiveCreatorSection
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationRecentlyActiveCreatorRoute
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationRecentlyActiveCreatorUiModel
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationUiState
import kr.co.vividnext.sodalive.v2.main.home.model.toHomeRecommendationBannerIntent
import kr.co.vividnext.sodalive.v2.main.home.model.toHomeRecommendationBannerRoute
import kr.co.vividnext.sodalive.v2.main.home.model.toHomeRecommendationAiCharacterIntent
import kr.co.vividnext.sodalive.v2.main.home.model.toHomeRecommendationAiCharacterRoute
import kr.co.vividnext.sodalive.v2.main.home.model.toHomeRecommendationRecentlyActiveCreatorIntent
import kr.co.vividnext.sodalive.v2.main.home.model.toHomeRecommendationRecentlyActiveCreatorRoute
import kr.co.vividnext.sodalive.v2.main.home.ui.HomeAiCharacterAdapter
import kr.co.vividnext.sodalive.v2.main.home.ui.HomeBannerBinder
@@ -581,15 +584,25 @@ class HomeMainFragment : BaseFragment<FragmentV2MainHomeBinding>(
private fun onBannerClick(item: HomeRecommendationBannerUiModel) {
val route = item.toHomeRecommendationBannerRoute() ?: return
ensureV2Access(AccessRequirement.Login) {
startActivity(route.toHomeRecommendationBannerIntent(requireContext()))
when (route) {
is HomeRecommendationBannerRoute.Series -> handleContentAction(
ContentActionCommand.SeriesDetail(seriesId = route.seriesId)
)
else -> ensureV2Access(AccessRequirement.Login) {
route.toHomeRecommendationBannerIntent(requireContext())?.let(::startActivity)
}
}
}
private fun onRecentActivityClick(item: HomeRecommendationRecentlyActiveCreatorUiModel) {
val route = item.toHomeRecommendationRecentlyActiveCreatorRoute() ?: return
ensureV2Access(AccessRequirement.Login) {
startActivity(route.toHomeRecommendationRecentlyActiveCreatorIntent(requireContext()))
when (route) {
is HomeRecommendationRecentlyActiveCreatorRoute.AudioContent -> handleContentAction(
ContentActionCommand.AudioDetail(audioContentId = route.contentId)
)
is HomeRecommendationRecentlyActiveCreatorRoute.Community -> ensureV2Access(AccessRequirement.Login) {
startActivity(CreatorChannelCommunityDetailActivity.newIntent(requireContext(), route.postId))
}
}
}
@@ -4,14 +4,11 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import kr.co.vividnext.sodalive.BuildConfig
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
import kr.co.vividnext.sodalive.common.Constants
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
import kr.co.vividnext.sodalive.settings.event.EventItem
import kr.co.vividnext.sodalive.v2.common.CreatorActivityType
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
import kr.co.vividnext.sodalive.v2.creator.channel.community.detail.CreatorChannelCommunityDetailActivity
import kr.co.vividnext.sodalive.v2.widget.characterchatthumbnail.CharacterChatThumbnailItem
import kr.co.vividnext.sodalive.v2.widget.feed.FeedItem
import java.util.Locale
@@ -100,7 +97,7 @@ fun HomeRecommendationBannerUiModel.toHomeRecommendationBannerRoute(): HomeRecom
)
}
fun HomeRecommendationBannerRoute.toHomeRecommendationBannerIntent(context: Context): Intent {
fun HomeRecommendationBannerRoute.toHomeRecommendationBannerIntent(context: Context): Intent? {
return when (this) {
is HomeRecommendationBannerRoute.Event -> {
Intent(context, EventDetailActivity::class.java).apply {
@@ -112,11 +109,7 @@ fun HomeRecommendationBannerRoute.toHomeRecommendationBannerIntent(context: Cont
CreatorChannelActivity.newIntent(context, creatorId)
}
is HomeRecommendationBannerRoute.Series -> {
Intent(context, SeriesDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_SERIES_ID, seriesId)
}
}
is HomeRecommendationBannerRoute.Series -> null
is HomeRecommendationBannerRoute.Link -> Intent(Intent.ACTION_VIEW, Uri.parse(url))
}
@@ -151,20 +144,6 @@ fun HomeRecommendationRecentlyActiveCreatorUiModel.toHomeRecommendationRecentlyA
}
}
fun HomeRecommendationRecentlyActiveCreatorRoute.toHomeRecommendationRecentlyActiveCreatorIntent(context: Context):
Intent {
return when (this) {
is HomeRecommendationRecentlyActiveCreatorRoute.AudioContent -> {
Intent(context, AudioContentDetailActivity::class.java).apply {
putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, contentId)
}
}
is HomeRecommendationRecentlyActiveCreatorRoute.Community ->
CreatorChannelCommunityDetailActivity.newIntent(context, postId)
}
}
data class HomeRecommendationCreatorUiModel(
val creatorId: Long,
val nickname: String,