parent
74c2db6ceb
commit
e0e935cf29
|
@ -55,7 +55,6 @@ import kr.co.vividnext.sodalive.explorer.ExplorerViewModel
|
||||||
import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
|
import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.live.LiveFragment
|
import kr.co.vividnext.sodalive.live.LiveFragment
|
||||||
import kr.co.vividnext.sodalive.message.MessageFragment
|
|
||||||
import kr.co.vividnext.sodalive.message.SelectMessageRecipientAdapter
|
import kr.co.vividnext.sodalive.message.SelectMessageRecipientAdapter
|
||||||
import kr.co.vividnext.sodalive.mypage.MyPageFragment
|
import kr.co.vividnext.sodalive.mypage.MyPageFragment
|
||||||
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
import kr.co.vividnext.sodalive.settings.event.EventDetailActivity
|
||||||
|
@ -308,7 +307,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
|
||||||
nextIntent.putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, contentId)
|
nextIntent.putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, contentId)
|
||||||
startActivity(nextIntent)
|
startActivity(nextIntent)
|
||||||
} else if (messageId > 0) {
|
} else if (messageId > 0) {
|
||||||
viewModel.clickTab(MainViewModel.CurrentTab.MESSAGE)
|
// 메시지 페이지로 이동
|
||||||
} else if (auditionId > 0) {
|
} else if (auditionId > 0) {
|
||||||
viewModel.clickTab(MainViewModel.CurrentTab.AUDITION)
|
viewModel.clickTab(MainViewModel.CurrentTab.AUDITION)
|
||||||
}
|
}
|
||||||
|
@ -410,17 +409,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
|
||||||
tab = MainViewModel.CurrentTab.AUDITION
|
tab = MainViewModel.CurrentTab.AUDITION
|
||||||
)
|
)
|
||||||
|
|
||||||
setupTab(
|
|
||||||
binding = binding.tabMessage,
|
|
||||||
title = "메시지",
|
|
||||||
imageSrc = R.drawable.ic_tabbar_message,
|
|
||||||
colorStateList = ContextCompat.getColorStateList(
|
|
||||||
applicationContext,
|
|
||||||
R.color.color_tabbar_title
|
|
||||||
),
|
|
||||||
tab = MainViewModel.CurrentTab.MESSAGE
|
|
||||||
)
|
|
||||||
|
|
||||||
setupTab(
|
setupTab(
|
||||||
binding = binding.tabMy,
|
binding = binding.tabMy,
|
||||||
title = "마이",
|
title = "마이",
|
||||||
|
@ -436,7 +424,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
|
||||||
setTabSelected(binding.tabContent, isSelected = false)
|
setTabSelected(binding.tabContent, isSelected = false)
|
||||||
setTabSelected(binding.tabLive, isSelected = false)
|
setTabSelected(binding.tabLive, isSelected = false)
|
||||||
setTabSelected(binding.tabAudition, isSelected = false)
|
setTabSelected(binding.tabAudition, isSelected = false)
|
||||||
setTabSelected(binding.tabMessage, isSelected = false)
|
|
||||||
setTabSelected(binding.tabMy, isSelected = false)
|
setTabSelected(binding.tabMy, isSelected = false)
|
||||||
|
|
||||||
changeFragment(it)
|
changeFragment(it)
|
||||||
|
@ -453,10 +440,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
|
||||||
setTabSelected(binding.tabAudition, isSelected = true)
|
setTabSelected(binding.tabAudition, isSelected = true)
|
||||||
}
|
}
|
||||||
|
|
||||||
MainViewModel.CurrentTab.MESSAGE -> {
|
|
||||||
setTabSelected(binding.tabMessage, isSelected = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
MainViewModel.CurrentTab.MY -> {
|
MainViewModel.CurrentTab.MY -> {
|
||||||
setTabSelected(binding.tabMy, isSelected = true)
|
setTabSelected(binding.tabMy, isSelected = true)
|
||||||
}
|
}
|
||||||
|
@ -509,7 +492,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
|
||||||
MainViewModel.CurrentTab.LIVE -> liveFragment
|
MainViewModel.CurrentTab.LIVE -> liveFragment
|
||||||
MainViewModel.CurrentTab.CONTENT -> AudioContentMainTabHomeFragment()
|
MainViewModel.CurrentTab.CONTENT -> AudioContentMainTabHomeFragment()
|
||||||
MainViewModel.CurrentTab.AUDITION -> AuditionFragment()
|
MainViewModel.CurrentTab.AUDITION -> AuditionFragment()
|
||||||
MainViewModel.CurrentTab.MESSAGE -> MessageFragment()
|
|
||||||
MainViewModel.CurrentTab.MY -> MyPageFragment()
|
MainViewModel.CurrentTab.MY -> MyPageFragment()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,9 +40,6 @@ class MainViewModel(
|
||||||
@SerializedName("AUDITION")
|
@SerializedName("AUDITION")
|
||||||
AUDITION,
|
AUDITION,
|
||||||
|
|
||||||
@SerializedName("MESSAGE")
|
|
||||||
MESSAGE,
|
|
||||||
|
|
||||||
@SerializedName("MY")
|
@SerializedName("MY")
|
||||||
MY
|
MY
|
||||||
}
|
}
|
||||||
|
|
|
@ -183,13 +183,6 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1" />
|
android:layout_weight="1" />
|
||||||
|
|
||||||
<include
|
|
||||||
android:id="@+id/tab_message"
|
|
||||||
layout="@layout/item_main_tab"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1" />
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
android:id="@+id/tab_my"
|
android:id="@+id/tab_my"
|
||||||
layout="@layout/item_main_tab"
|
layout="@layout/item_main_tab"
|
||||||
|
|
Loading…
Reference in New Issue