diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/main/content/ContentMainFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/main/content/ContentMainFragment.kt index 70eb0ad8..10b4cf44 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/main/content/ContentMainFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/main/content/ContentMainFragment.kt @@ -22,7 +22,6 @@ import kr.co.vividnext.sodalive.common.LoadingDialog import kr.co.vividnext.sodalive.common.ToastMessage import kr.co.vividnext.sodalive.databinding.FragmentV2MainContentBinding import kr.co.vividnext.sodalive.databinding.ViewSectionTitleBinding -import kr.co.vividnext.sodalive.extensions.moneyFormat import kr.co.vividnext.sodalive.home.SeriesPublishedDaysOfWeek import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity import kr.co.vividnext.sodalive.search.SearchActivity @@ -44,6 +43,7 @@ import kr.co.vividnext.sodalive.v2.main.content.model.ContentCommentedAudioUiMod import kr.co.vividnext.sodalive.v2.main.content.model.ContentOriginalSeriesSection import kr.co.vividnext.sodalive.v2.main.content.model.ContentOriginalSeriesUiModel import kr.co.vividnext.sodalive.v2.main.content.model.MainContentAllTabUiState +import kr.co.vividnext.sodalive.v2.main.content.model.contentAllSortOptions import kr.co.vividnext.sodalive.v2.main.content.model.contentAllDayOfWeekOptions import kr.co.vividnext.sodalive.v2.main.content.model.toContentAllDayLabelResId import kr.co.vividnext.sodalive.v2.main.content.model.toContentAllTypeLabelResId @@ -232,7 +232,7 @@ class ContentMainFragment : BaseFragment( private fun setUpAllSortButton() { binding.layoutContentAllSortButton.setOnClickListener { val state = currentAllTabState ?: return@setOnClickListener - showAllSortPopup(state.selectedSort) + showAllSortPopup(state) } } @@ -463,7 +463,6 @@ class ContentMainFragment : BaseFragment( } private fun bindAllTabControls(state: MainContentAllTabUiState) { - binding.tvContentAllTotalCount.text = state.totalCount.moneyFormat() binding.tvContentAllSortLabel.setText(state.selectedSort.toLabelResId()) binding.viewContentAllTypeTabs.root.setMenus( contentAllTypes.map { type -> getString(type.toContentAllTypeLabelResId()) }, @@ -495,13 +494,15 @@ class ContentMainFragment : BaseFragment( binding.layoutContentAllEmptyError.visibility = View.GONE } - private fun showAllSortPopup(selectedSort: ContentSort) { + private fun showAllSortPopup(state: MainContentAllTabUiState) { + val sortOptions = state.selectedType.contentAllSortOptions() sortPopup?.dismiss() sortPopup = CreatorChannelSortPopup( anchor = binding.layoutContentAllSortButton, - selectedSort = selectedSort, + selectedSort = state.selectedSort, + sortOptions = sortOptions, onSortSelected = { sort -> - if (sort in ContentSort.entries) { + if (sort in sortOptions) { contentAllTabViewModel.changeSort(sort) } } diff --git a/app/src/main/res/layout/fragment_v2_main_content.xml b/app/src/main/res/layout/fragment_v2_main_content.xml index 60ed8bb5..e3dffa17 100644 --- a/app/src/main/res/layout/fragment_v2_main_content.xml +++ b/app/src/main/res/layout/fragment_v2_main_content.xml @@ -69,24 +69,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/layout_content_all_day_filter"> - - - + android:layout_weight="1" />