feat(main): 메인 채널 진입점을 전환한다
This commit is contained in:
@@ -10,12 +10,12 @@ import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
|||||||
import kr.co.vividnext.sodalive.app.SodaLiveApp
|
import kr.co.vividnext.sodalive.app.SodaLiveApp
|
||||||
import kr.co.vividnext.sodalive.audition.AuditionActivity
|
import kr.co.vividnext.sodalive.audition.AuditionActivity
|
||||||
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.live.room.LiveRoomActivity
|
import kr.co.vividnext.sodalive.live.room.LiveRoomActivity
|
||||||
import kr.co.vividnext.sodalive.message.MessageActivity
|
import kr.co.vividnext.sodalive.message.MessageActivity
|
||||||
import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentActivity
|
import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentActivity
|
||||||
import kr.co.vividnext.sodalive.splash.SplashActivity
|
import kr.co.vividnext.sodalive.splash.SplashActivity
|
||||||
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelHomeActivity
|
||||||
import kr.co.vividnext.sodalive.v2.main.MainV2Activity
|
import kr.co.vividnext.sodalive.v2.main.MainV2Activity
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
|
||||||
@@ -275,9 +275,7 @@ class DeepLinkActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
channelId != null && channelId > 0 -> {
|
channelId != null && channelId > 0 -> {
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(applicationContext, UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(applicationContext, channelId)
|
||||||
putExtra(Constants.EXTRA_USER_ID, channelId)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -357,9 +355,7 @@ class DeepLinkActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(applicationContext, UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(applicationContext, deepLinkValueId)
|
||||||
putExtra(Constants.EXTRA_USER_ID, deepLinkValueId)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ 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.ActivityMainBinding
|
import kr.co.vividnext.sodalive.databinding.ActivityMainBinding
|
||||||
import kr.co.vividnext.sodalive.databinding.ItemMainTabBinding
|
import kr.co.vividnext.sodalive.databinding.ItemMainTabBinding
|
||||||
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.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.home.HomeFragment
|
import kr.co.vividnext.sodalive.home.HomeFragment
|
||||||
@@ -56,6 +55,7 @@ import kr.co.vividnext.sodalive.mypage.MyPageFragment
|
|||||||
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
||||||
import kr.co.vividnext.sodalive.settings.notification.NotificationSettingsDialog
|
import kr.co.vividnext.sodalive.settings.notification.NotificationSettingsDialog
|
||||||
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
||||||
|
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.util.Locale
|
import java.util.Locale
|
||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
@@ -349,9 +349,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
|
|||||||
}
|
}
|
||||||
|
|
||||||
channelId != null && channelId > 0 -> {
|
channelId != null && channelId > 0 -> {
|
||||||
val nextIntent = Intent(applicationContext, UserProfileActivity::class.java)
|
startActivity(CreatorChannelHomeActivity.newIntent(applicationContext, channelId))
|
||||||
nextIntent.putExtra(Constants.EXTRA_USER_ID, channelId)
|
|
||||||
startActivity(nextIntent)
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -577,9 +575,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
|
|||||||
}
|
}
|
||||||
|
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(applicationContext, UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(applicationContext, deepLinkValueId)
|
||||||
putExtra(Constants.EXTRA_USER_ID, deepLinkValueId)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ import kr.co.vividnext.sodalive.base.BaseActivity
|
|||||||
import kr.co.vividnext.sodalive.common.Constants
|
import kr.co.vividnext.sodalive.common.Constants
|
||||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||||
import kr.co.vividnext.sodalive.databinding.ActivityMainV2Binding
|
import kr.co.vividnext.sodalive.databinding.ActivityMainV2Binding
|
||||||
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.main.EventPopupDialogFragment
|
import kr.co.vividnext.sodalive.main.EventPopupDialogFragment
|
||||||
import kr.co.vividnext.sodalive.message.MessageActivity
|
import kr.co.vividnext.sodalive.message.MessageActivity
|
||||||
@@ -47,6 +46,7 @@ import kr.co.vividnext.sodalive.mypage.MyPageFragment
|
|||||||
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
||||||
import kr.co.vividnext.sodalive.settings.notification.NotificationSettingsDialog
|
import kr.co.vividnext.sodalive.settings.notification.NotificationSettingsDialog
|
||||||
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
import kr.co.vividnext.sodalive.user.login.LoginActivity
|
||||||
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelHomeActivity
|
||||||
import kr.co.vividnext.sodalive.v2.main.home.HomeMainFragment
|
import kr.co.vividnext.sodalive.v2.main.home.HomeMainFragment
|
||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
@@ -534,9 +534,7 @@ class MainV2Activity : BaseActivity<ActivityMainV2Binding>(ActivityMainV2Binding
|
|||||||
when {
|
when {
|
||||||
channelId != null && channelId > 0 -> {
|
channelId != null && channelId > 0 -> {
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(applicationContext, UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(applicationContext, channelId)
|
||||||
putExtra(Constants.EXTRA_USER_ID, channelId)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -609,9 +607,7 @@ class MainV2Activity : BaseActivity<ActivityMainV2Binding>(ActivityMainV2Binding
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(applicationContext, UserProfileActivity::class.java).apply {
|
CreatorChannelHomeActivity.newIntent(applicationContext, deepLinkValueId)
|
||||||
putExtra(Constants.EXTRA_USER_ID, deepLinkValueId)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user