diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt index b03daf8192..c710b27317 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt @@ -226,19 +226,24 @@ class ForumArticleAskListAdapter( holder.binding.articleListHeadTv.setTextColor(R.color.text_title.toColor(mContext)) holder.binding.articleListHeadTv.text = "${articleListHead}列表" - holder.binding.orderSfv.run { - setContainerBackground(R.drawable.button_round_f5f5f5.toDrawable(mContext)) - setIndicatorBackground(R.drawable.bg_game_collection_sfv_indicator.toDrawable(mContext)) - setTextColor( - R.color.text_subtitle.toColor(mContext), - R.color.text_subtitleDesc.toColor(mContext) - ) + if (path != "精华") { + holder.binding.orderSfv.run { + visibility = View.VISIBLE + setContainerBackground(R.drawable.button_round_f5f5f5.toDrawable(mContext)) + setIndicatorBackground(R.drawable.bg_game_collection_sfv_indicator.toDrawable(mContext)) + setTextColor( + R.color.text_subtitle.toColor(mContext), + R.color.text_subtitleDesc.toColor(mContext) + ) - setItemList(if (path == "视频") mVideoOrderList else mDefOrderList, mFilterPosition) - setOnCheckedCallback { position -> - mFilterPosition = position - onCheckCallback.invoke((if (path == "视频") mVideoOrderList else mDefOrderList)[position]) + setItemList(if (path == "视频") mVideoOrderList else mDefOrderList, mFilterPosition) + setOnCheckedCallback { position -> + mFilterPosition = position + onCheckCallback.invoke((if (path == "视频") mVideoOrderList else mDefOrderList)[position]) + } } + } else { + holder.binding.orderSfv.visibility = View.GONE } } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt index 2bb4b4d71d..5d599e910f 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt @@ -23,8 +23,8 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat import androidx.core.graphics.ColorUtils import androidx.core.os.bundleOf -import androidx.core.os.postDelayed import androidx.core.view.ViewCompat +import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.recyclerview.widget.DefaultItemAnimator @@ -374,11 +374,12 @@ class ForumDetailFragment : BaseLazyTabFragment(), IScrollable { } private fun initSection() { + val sectionLayoutManager = LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false) mForumSectionAdapter = ForumSectionAdapter(requireContext(), mViewModel!!) { setSection(it) } mBinding.sectionRv.run { - layoutManager = LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false) + layoutManager = sectionLayoutManager adapter = mForumSectionAdapter (itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false addOnScrollListener(object : OnScrollListener() { @@ -406,6 +407,12 @@ class ForumDetailFragment : BaseLazyTabFragment(), IScrollable { } else { mForumSectionAdapter?.submitList(it) } + mBinding.sectionRv.post { + mBinding.sectionMoreIv.isVisible = + sectionLayoutManager.findLastCompletelyVisibleItemPosition() != sectionLayoutManager.itemCount - 1 + mBinding.sectionMoreBackground.isVisible = + sectionLayoutManager.findLastCompletelyVisibleItemPosition() != sectionLayoutManager.itemCount - 1 + } } else { mShowSections = false mBinding.sectionContainer.visibility = View.GONE diff --git a/app/src/main/res/layout/fragment_forum_detail.xml b/app/src/main/res/layout/fragment_forum_detail.xml index 268557e26d..ab83dae336 100644 --- a/app/src/main/res/layout/fragment_forum_detail.xml +++ b/app/src/main/res/layout/fragment_forum_detail.xml @@ -385,13 +385,15 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/sectionMoreBackground" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_goneMarginEnd="0dp" /> @@ -402,6 +404,7 @@ android:layout_marginTop="14dp" android:layout_marginEnd="16dp" android:layout_marginRight="16dp" + android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/icon_section_more" />