feat(home): 홈 채널 진입점을 전환한다
This commit is contained in:
@@ -45,7 +45,6 @@ import kr.co.vividnext.sodalive.common.Constants
|
|||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||||
import kr.co.vividnext.sodalive.databinding.FragmentHomeBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentHomeBinding
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
|
|
||||||
import kr.co.vividnext.sodalive.home.pushnotification.PushNotificationListActivity
|
import kr.co.vividnext.sodalive.home.pushnotification.PushNotificationListActivity
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.live.LiveViewModel
|
import kr.co.vividnext.sodalive.live.LiveViewModel
|
||||||
@@ -66,6 +65,7 @@ import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
|||||||
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
||||||
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
import kr.co.vividnext.sodalive.splash.SplashActivity
|
||||||
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelHomeActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
@@ -271,12 +271,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
|
|||||||
onClickItem = {
|
onClickItem = {
|
||||||
if (SharedPreferenceManager.token.isNotBlank()) {
|
if (SharedPreferenceManager.token.isNotBlank()) {
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(
|
CreatorChannelHomeActivity.newIntent(requireActivity(), it)
|
||||||
requireActivity(),
|
|
||||||
UserProfileActivity::class.java
|
|
||||||
).apply {
|
|
||||||
putExtra(Constants.EXTRA_USER_ID, it)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
(requireActivity() as MainActivity).showLoginActivity()
|
(requireActivity() as MainActivity).showLoginActivity()
|
||||||
@@ -503,9 +498,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
|
|||||||
|
|
||||||
AudioContentBannerType.CREATOR -> {
|
AudioContentBannerType.CREATOR -> {
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(requireContext(), UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(requireContext(), it.creatorId!!)
|
||||||
putExtra(Constants.EXTRA_USER_ID, it.creatorId!!)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -922,9 +915,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
|
|||||||
onClickCreatorProfile = {
|
onClickCreatorProfile = {
|
||||||
if (SharedPreferenceManager.token.isNotBlank()) {
|
if (SharedPreferenceManager.token.isNotBlank()) {
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(requireContext(), UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(requireContext(), it)
|
||||||
putExtra(Constants.EXTRA_USER_ID, it)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
(requireActivity() as MainActivity).showLoginActivity()
|
(requireActivity() as MainActivity).showLoginActivity()
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ import kr.co.vividnext.sodalive.common.ToastMessage
|
|||||||
import kr.co.vividnext.sodalive.common.formatUtcRelativeTimeText
|
import kr.co.vividnext.sodalive.common.formatUtcRelativeTimeText
|
||||||
import kr.co.vividnext.sodalive.databinding.FragmentV2MainHomeBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentV2MainHomeBinding
|
||||||
import kr.co.vividnext.sodalive.databinding.ViewSectionTitleBinding
|
import kr.co.vividnext.sodalive.databinding.ViewSectionTitleBinding
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
|
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.creator_community.all.CreatorCommunityAllActivity
|
import kr.co.vividnext.sodalive.explorer.profile.creator_community.all.CreatorCommunityAllActivity
|
||||||
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelHomeActivity
|
||||||
import kr.co.vividnext.sodalive.v2.main.home.model.HomeCreatorRankingUiState
|
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.HomeRecommendationAiCharacterSection
|
||||||
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationBannerSection
|
import kr.co.vividnext.sodalive.v2.main.home.model.HomeRecommendationBannerSection
|
||||||
@@ -346,9 +346,7 @@ class HomeMainFragment : BaseFragment<FragmentV2MainHomeBinding>(
|
|||||||
|
|
||||||
private fun openCreatorProfile(creatorId: Long) {
|
private fun openCreatorProfile(creatorId: Long) {
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(requireContext(), UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(requireContext(), creatorId)
|
||||||
putExtra(Constants.EXTRA_USER_ID, creatorId)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ import kr.co.vividnext.sodalive.BuildConfig
|
|||||||
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
|
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.series.detail.SeriesDetailActivity
|
||||||
import kr.co.vividnext.sodalive.common.Constants
|
import kr.co.vividnext.sodalive.common.Constants
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
|
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.creator_community.all.CreatorCommunityAllActivity
|
import kr.co.vividnext.sodalive.explorer.profile.creator_community.all.CreatorCommunityAllActivity
|
||||||
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
||||||
import kr.co.vividnext.sodalive.settings.event.EventItem
|
import kr.co.vividnext.sodalive.settings.event.EventItem
|
||||||
import kr.co.vividnext.sodalive.v2.common.CreatorActivityType
|
import kr.co.vividnext.sodalive.v2.common.CreatorActivityType
|
||||||
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelHomeActivity
|
||||||
import kr.co.vividnext.sodalive.v2.widget.AudioContentTag
|
import kr.co.vividnext.sodalive.v2.widget.AudioContentTag
|
||||||
import kr.co.vividnext.sodalive.v2.widget.characterchatthumbnail.CharacterChatThumbnailItem
|
import kr.co.vividnext.sodalive.v2.widget.characterchatthumbnail.CharacterChatThumbnailItem
|
||||||
import kr.co.vividnext.sodalive.v2.widget.feed.FeedItem
|
import kr.co.vividnext.sodalive.v2.widget.feed.FeedItem
|
||||||
@@ -114,9 +114,7 @@ fun HomeRecommendationBannerRoute.toHomeRecommendationBannerIntent(context: Cont
|
|||||||
}
|
}
|
||||||
|
|
||||||
is HomeRecommendationBannerRoute.Creator -> {
|
is HomeRecommendationBannerRoute.Creator -> {
|
||||||
Intent(context, UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(context, creatorId)
|
||||||
putExtra(Constants.EXTRA_USER_ID, creatorId)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
is HomeRecommendationBannerRoute.Series -> {
|
is HomeRecommendationBannerRoute.Series -> {
|
||||||
|
|||||||
@@ -27,10 +27,10 @@ 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.series.detail.SeriesDetailActivity
|
||||||
import kr.co.vividnext.sodalive.common.Constants
|
import kr.co.vividnext.sodalive.common.Constants
|
||||||
import kr.co.vividnext.sodalive.common.formatUtcRelativeTimeText
|
import kr.co.vividnext.sodalive.common.formatUtcRelativeTimeText
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
|
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.creator_community.all.CreatorCommunityAllActivity
|
import kr.co.vividnext.sodalive.explorer.profile.creator_community.all.CreatorCommunityAllActivity
|
||||||
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
||||||
import kr.co.vividnext.sodalive.settings.event.EventItem
|
import kr.co.vividnext.sodalive.settings.event.EventItem
|
||||||
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelHomeActivity
|
||||||
import kr.co.vividnext.sodalive.v2.main.home.data.HomeActiveCreatorItem
|
import kr.co.vividnext.sodalive.v2.main.home.data.HomeActiveCreatorItem
|
||||||
import kr.co.vividnext.sodalive.v2.main.home.data.HomeBannerItem
|
import kr.co.vividnext.sodalive.v2.main.home.data.HomeBannerItem
|
||||||
import kr.co.vividnext.sodalive.v2.main.home.data.HomeCreatorItem
|
import kr.co.vividnext.sodalive.v2.main.home.data.HomeCreatorItem
|
||||||
@@ -1013,8 +1013,8 @@ class HomeMainFragmentLayoutTest {
|
|||||||
|
|
||||||
assertEquals(EventDetailActivity::class.java.name, eventIntent.component?.className)
|
assertEquals(EventDetailActivity::class.java.name, eventIntent.component?.className)
|
||||||
assertEquals(eventItem, eventIntent.getParcelableExtra(Constants.EXTRA_EVENT))
|
assertEquals(eventItem, eventIntent.getParcelableExtra(Constants.EXTRA_EVENT))
|
||||||
assertEquals(UserProfileActivity::class.java.name, creatorIntent.component?.className)
|
assertEquals(CreatorChannelHomeActivity::class.java.name, creatorIntent.component?.className)
|
||||||
assertEquals(2L, creatorIntent.getLongExtra(Constants.EXTRA_USER_ID, 0L))
|
assertEquals(2L, creatorIntent.getLongExtra(CreatorChannelHomeActivity.EXTRA_CREATOR_ID, 0L))
|
||||||
assertEquals(SeriesDetailActivity::class.java.name, seriesIntent.component?.className)
|
assertEquals(SeriesDetailActivity::class.java.name, seriesIntent.component?.className)
|
||||||
assertEquals(3L, seriesIntent.getLongExtra(Constants.EXTRA_SERIES_ID, 0L))
|
assertEquals(3L, seriesIntent.getLongExtra(Constants.EXTRA_SERIES_ID, 0L))
|
||||||
assertEquals(android.content.Intent.ACTION_VIEW, webIntent.action)
|
assertEquals(android.content.Intent.ACTION_VIEW, webIntent.action)
|
||||||
|
|||||||
Reference in New Issue
Block a user