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 33e36345..9efe2865 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 @@ -35,7 +35,6 @@ import kr.co.vividnext.sodalive.audio_content.main.v2.home.AudioContentMainTabHo import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerFragment import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity -import kr.co.vividnext.sodalive.audition.AuditionFragment import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants import kr.co.vividnext.sodalive.common.LoadingDialog @@ -310,7 +309,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl } else if (messageId > 0) { startActivity(Intent(applicationContext, MessageActivity::class.java)) } else if (auditionId > 0) { - viewModel.clickTab(MainViewModel.CurrentTab.AUDITION) } } catch (_: IllegalStateException) { } @@ -377,14 +375,14 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl private fun setupBottomTabLayout() { setupTab( - binding = binding.tabContent, - title = "콘텐츠", - imageSrc = R.drawable.ic_tabbar_content, + binding = binding.tabHome, + title = "홈", + imageSrc = R.drawable.ic_tabbar_home, colorStateList = ContextCompat.getColorStateList( applicationContext, R.color.color_tabbar_title ), - tab = MainViewModel.CurrentTab.CONTENT + tab = MainViewModel.CurrentTab.HOME ) setupTab( @@ -398,17 +396,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl tab = MainViewModel.CurrentTab.LIVE ) - setupTab( - binding = binding.tabAudition, - title = "오디션", - imageSrc = R.drawable.ic_tabbar_audition, - colorStateList = ContextCompat.getColorStateList( - applicationContext, - R.color.color_tabbar_title - ), - tab = MainViewModel.CurrentTab.AUDITION - ) - setupTab( binding = binding.tabMy, title = "마이", @@ -421,25 +408,20 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl ) viewModel.currentTab.observe(this) { - setTabSelected(binding.tabContent, isSelected = false) + setTabSelected(binding.tabHome, isSelected = false) setTabSelected(binding.tabLive, isSelected = false) - setTabSelected(binding.tabAudition, isSelected = false) setTabSelected(binding.tabMy, isSelected = false) changeFragment(it) when (it) { - MainViewModel.CurrentTab.CONTENT -> { - setTabSelected(binding.tabContent, isSelected = true) + MainViewModel.CurrentTab.HOME -> { + setTabSelected(binding.tabHome, isSelected = true) } MainViewModel.CurrentTab.LIVE -> { setTabSelected(binding.tabLive, isSelected = true) } - MainViewModel.CurrentTab.AUDITION -> { - setTabSelected(binding.tabAudition, isSelected = true) - } - MainViewModel.CurrentTab.MY -> { setTabSelected(binding.tabMy, isSelected = true) } @@ -490,8 +472,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl if (fragment == null) { fragment = when (currentTab) { MainViewModel.CurrentTab.LIVE -> liveFragment - MainViewModel.CurrentTab.CONTENT -> AudioContentMainTabHomeFragment() - MainViewModel.CurrentTab.AUDITION -> AuditionFragment() + MainViewModel.CurrentTab.HOME -> AudioContentMainTabHomeFragment() 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 f2221fbe..7d886a87 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 @@ -33,20 +33,17 @@ class MainViewModel( private val playbackTrackingRepository: PlaybackTrackingRepository ) : BaseViewModel() { enum class CurrentTab { - @SerializedName("CONTENT") - CONTENT, + @SerializedName("HOME") + HOME, @SerializedName("LIVE") LIVE, - @SerializedName("AUDITION") - AUDITION, - @SerializedName("MY") MY } - private val _currentTab = MutableLiveData(CurrentTab.CONTENT) + private val _currentTab = MutableLiveData(CurrentTab.HOME) val currentTab: LiveData get() = _currentTab diff --git a/app/src/main/res/color/color_tabbar_title.xml b/app/src/main/res/color/color_tabbar_title.xml index e6bf7b9d..b38425be 100644 --- a/app/src/main/res/color/color_tabbar_title.xml +++ b/app/src/main/res/color/color_tabbar_title.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable-mdpi/ic_chat.png b/app/src/main/res/drawable-mdpi/ic_chat.png new file mode 100644 index 00000000..f8cc5755 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_chat.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_chat_selected.png b/app/src/main/res/drawable-mdpi/ic_chat_selected.png new file mode 100644 index 00000000..585a1285 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_chat_selected.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_home.png b/app/src/main/res/drawable-mdpi/ic_home.png new file mode 100644 index 00000000..1782cc12 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_home.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_home_selected.png b/app/src/main/res/drawable-mdpi/ic_home_selected.png new file mode 100644 index 00000000..8e4aa77b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_home_selected.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_live.png b/app/src/main/res/drawable-mdpi/ic_live.png new file mode 100644 index 00000000..a9b16667 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_live.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_live_selected.png b/app/src/main/res/drawable-mdpi/ic_live_selected.png new file mode 100644 index 00000000..bcec1adf Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_live_selected.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_my.png b/app/src/main/res/drawable-mdpi/ic_my.png new file mode 100644 index 00000000..9716ab7d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_my.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_my_selected.png b/app/src/main/res/drawable-mdpi/ic_my_selected.png new file mode 100644 index 00000000..029522ff Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_my_selected.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_subscribe.png b/app/src/main/res/drawable-mdpi/ic_subscribe.png new file mode 100644 index 00000000..4e071a74 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_subscribe.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_subscribe_selected.png b/app/src/main/res/drawable-mdpi/ic_subscribe_selected.png new file mode 100644 index 00000000..a896c516 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_subscribe_selected.png differ diff --git a/app/src/main/res/drawable/ic_tabbar_home.xml b/app/src/main/res/drawable/ic_tabbar_home.xml new file mode 100644 index 00000000..5c818270 --- /dev/null +++ b/app/src/main/res/drawable/ic_tabbar_home.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_tabbar_live.xml b/app/src/main/res/drawable/ic_tabbar_live.xml index b1c2c480..46be9509 100644 --- a/app/src/main/res/drawable/ic_tabbar_live.xml +++ b/app/src/main/res/drawable/ic_tabbar_live.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable/ic_tabbar_my.xml b/app/src/main/res/drawable/ic_tabbar_my.xml index 0f0410de..1ee51e6e 100644 --- a/app/src/main/res/drawable/ic_tabbar_my.xml +++ b/app/src/main/res/drawable/ic_tabbar_my.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5630178b..9325afa3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -163,7 +163,7 @@ app:labelVisibilityMode="labeled"> - -