diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt index 935d7eb..e4dcc36 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt @@ -55,7 +55,6 @@ import kr.co.vividnext.sodalive.explorer.ExplorerViewModel import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity import kr.co.vividnext.sodalive.extensions.dpToPx 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.mypage.MyPageFragment import kr.co.vividnext.sodalive.settings.event.EventDetailActivity @@ -308,7 +307,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl nextIntent.putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, contentId) startActivity(nextIntent) } else if (messageId > 0) { - viewModel.clickTab(MainViewModel.CurrentTab.MESSAGE) + // 메시지 페이지로 이동 } else if (auditionId > 0) { viewModel.clickTab(MainViewModel.CurrentTab.AUDITION) } @@ -410,17 +409,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl 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( binding = binding.tabMy, title = "마이", @@ -436,7 +424,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl setTabSelected(binding.tabContent, isSelected = false) setTabSelected(binding.tabLive, isSelected = false) setTabSelected(binding.tabAudition, isSelected = false) - setTabSelected(binding.tabMessage, isSelected = false) setTabSelected(binding.tabMy, isSelected = false) changeFragment(it) @@ -453,10 +440,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl setTabSelected(binding.tabAudition, isSelected = true) } - MainViewModel.CurrentTab.MESSAGE -> { - setTabSelected(binding.tabMessage, isSelected = true) - } - MainViewModel.CurrentTab.MY -> { setTabSelected(binding.tabMy, isSelected = true) } @@ -509,7 +492,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl MainViewModel.CurrentTab.LIVE -> liveFragment MainViewModel.CurrentTab.CONTENT -> AudioContentMainTabHomeFragment() MainViewModel.CurrentTab.AUDITION -> AuditionFragment() - MainViewModel.CurrentTab.MESSAGE -> MessageFragment() MainViewModel.CurrentTab.MY -> MyPageFragment() } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainViewModel.kt index 89df39f..8f7953c 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/main/MainViewModel.kt @@ -40,9 +40,6 @@ class MainViewModel( @SerializedName("AUDITION") AUDITION, - @SerializedName("MESSAGE") - MESSAGE, - @SerializedName("MY") MY } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b9f59c7..9786237 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -183,13 +183,6 @@ android:layout_height="wrap_content" android:layout_weight="1" /> - -