diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java index 321eeb7fa8..e0c328f3f0 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java @@ -244,13 +244,14 @@ public class AnswerAdapter extends ListAdapter implements ISyncAda checkSelectItems(); notifyItemRangeChanged(0, mEntityList.size()); }); + checkSelectItems(); } private void checkSelectItems() { if (mPopupBinding == null) return; mPopupBinding.selectNumTv.setText(selectItems.isEmpty() ? "" : "(" + selectItems.size() + ")"); mPopupBinding.itemDelete.setBackground(selectItems.isEmpty() ? ExtensionsKt.toDrawable(R.drawable.bg_shape_f5_radius_999) : ExtensionsKt.toDrawable(R.drawable.download_button_normal_style)); - mPopupBinding.itemDelete.setTextColor(selectItems.isEmpty() ? ExtensionsKt.toColor(R.color.text_subtitle) : ExtensionsKt.toColor(R.color.white)); + mPopupBinding.itemDelete.setTextColor(selectItems.isEmpty() ? ExtensionsKt.toColor(R.color.text_body) : ExtensionsKt.toColor(R.color.white)); mPopupBinding.itemDelete.setEnabled(!selectItems.isEmpty()); mPopupBinding.checkAllCb.setChecked(selectItems.size() == mEntityList.size()); } diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java index f809b253d1..3a64342955 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -374,13 +374,14 @@ public class ArticleAdapter extends ListAdapter { checkSelectItems(); notifyItemRangeChanged(0, mEntityList.size()); }); + checkSelectItems(); } private void checkSelectItems() { if (mPopupBinding == null) return; mPopupBinding.selectNumTv.setText(selectItems.isEmpty() ? "" : "(" + selectItems.size() + ")"); mPopupBinding.itemDelete.setBackground(selectItems.isEmpty() ? ExtensionsKt.toDrawable(R.drawable.bg_shape_f5_radius_999) : ExtensionsKt.toDrawable(R.drawable.download_button_normal_style)); - mPopupBinding.itemDelete.setTextColor(selectItems.isEmpty() ? ExtensionsKt.toColor(R.color.text_subtitle) : ExtensionsKt.toColor(R.color.white)); + mPopupBinding.itemDelete.setTextColor(selectItems.isEmpty() ? ExtensionsKt.toColor(R.color.text_body) : ExtensionsKt.toColor(R.color.white)); mPopupBinding.itemDelete.setEnabled(!selectItems.isEmpty()); mPopupBinding.checkAllCb.setChecked(selectItems.size() == mEntityList.size()); } diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt index 1f5ff033f7..1d7765d312 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt @@ -167,6 +167,7 @@ class CommunityArticleAdapter( checkSelectItems() notifyItemRangeChanged(0, mEntityList.size) } + checkSelectItems() } private fun checkSelectItems() { @@ -174,7 +175,7 @@ class CommunityArticleAdapter( selectNumTv.text = if (selectItems.isEmpty()) "" else "(${selectItems.size})" itemDelete.background = if (selectItems.isEmpty()) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.download_button_normal_style.toDrawable() - itemDelete.setTextColor(if (selectItems.isEmpty()) R.color.text_subtitle.toColor() else R.color.white.toColor()) + itemDelete.setTextColor(if (selectItems.isEmpty()) R.color.text_body.toColor() else R.color.white.toColor()) itemDelete.isEnabled = selectItems.isNotEmpty() checkAllCb.isChecked = selectItems.size == mEntityList.size } diff --git a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt index 478f3c7ec6..a6fc8d9d17 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt @@ -396,6 +396,7 @@ class GamesCollectionAdapter( checkSelectItems() notifyItemRangeChanged(0, mEntityList.size) } + checkSelectItems() } private fun checkSelectItems() { @@ -403,7 +404,7 @@ class GamesCollectionAdapter( selectNumTv.text = if (selectItems.isEmpty()) "" else "(${selectItems.size})" itemDelete.background = if (selectItems.isEmpty()) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.download_button_normal_style.toDrawable() - itemDelete.setTextColor(if (selectItems.isEmpty()) R.color.text_subtitle.toColor() else R.color.white.toColor()) + itemDelete.setTextColor(if (selectItems.isEmpty()) R.color.text_body.toColor() else R.color.white.toColor()) itemDelete.isEnabled = selectItems.isNotEmpty() checkAllCb.isChecked = selectItems.size == mEntityList.size } diff --git a/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt index 9cf2165f3c..41bcffc670 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt @@ -161,6 +161,7 @@ class VideoAdapter( checkSelectItems() notifyItemRangeChanged(0, mEntityList.size) } + checkSelectItems() } private fun checkSelectItems() { @@ -168,7 +169,7 @@ class VideoAdapter( selectNumTv.text = if (selectItems.isEmpty()) "" else "(${selectItems.size})" itemDelete.background = if (selectItems.isEmpty()) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.download_button_normal_style.toDrawable() - itemDelete.setTextColor(if (selectItems.isEmpty()) R.color.text_subtitle.toColor() else R.color.white.toColor()) + itemDelete.setTextColor(if (selectItems.isEmpty()) R.color.text_body.toColor() else R.color.white.toColor()) itemDelete.isEnabled = selectItems.isNotEmpty() checkAllCb.isChecked = selectItems.size == mEntityList.size } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt index 78a86766b5..efa0d4cb4b 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt @@ -267,7 +267,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { indicatorView.updateIndicatorDrawable( ContextCompat.getDrawable( requireContext(), - R.drawable.ic_home_tab_indicator_colorful + R.drawable.ic_forum_tab_indicator ) ) } @@ -286,7 +286,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent) mTabSelectedColor = TAB_SELECTED_COLOR mTabDefaultColor = TAB_DEFAULT_COLOR - mBinding?.indicatorView?.updateIndicatorDrawable(R.drawable.ic_home_tab_indicator_colorful.toDrawable()) + mBinding?.indicatorView?.updateIndicatorDrawable(R.drawable.ic_forum_tab_indicator.toDrawable()) updateTabTextStyle(mLastSelectedPosition, 0f) } else if (offset < totalHeight) { currentTab?.isTopViewShow = true @@ -307,7 +307,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { if (currentTab?.offsetRatio ?: 0f < mOffsetCritical) TAB_DEFAULT_COLOR_LIGHT else TAB_DEFAULT_COLOR mBinding?.indicatorView?.updateIndicatorDrawable( if (currentTab?.offsetRatio ?: 0f < mOffsetCritical) R.drawable.ic_home_tab_indicator_white.toDrawable() else - R.drawable.ic_home_tab_indicator_colorful.toDrawable() + R.drawable.ic_forum_tab_indicator.toDrawable() ) updateTabTextStyle(mLastSelectedPosition, 0f) } diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt index 43e3da3e37..8fcd5e799d 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt @@ -155,6 +155,7 @@ class HistoryGameListAdapter(context: Context, private val mViewModel: HistoryGa checkSelectItems() notifyItemRangeChanged(0, mEntityList.size) } + checkSelectItems() } private fun checkSelectItems() { @@ -162,7 +163,7 @@ class HistoryGameListAdapter(context: Context, private val mViewModel: HistoryGa selectNumTv.text = if (selectItems.isEmpty()) "" else "(${selectItems.size})" itemDelete.background = if (selectItems.isEmpty()) R.drawable.bg_shape_f5_radius_999.toDrawable() else R.drawable.download_button_normal_style.toDrawable() - itemDelete.setTextColor(if (selectItems.isEmpty()) R.color.text_subtitle.toColor() else R.color.white.toColor()) + itemDelete.setTextColor(if (selectItems.isEmpty()) R.color.text_body.toColor() else R.color.white.toColor()) itemDelete.isEnabled = selectItems.isNotEmpty() checkAllCb.isChecked = selectItems.size == mEntityList.size } diff --git a/app/src/main/res/drawable-xxxhdpi/ic_history_video_unselect.webp b/app/src/main/res/drawable-xxxhdpi/ic_history_video_unselect.webp new file mode 100644 index 0000000000..202d14ed51 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_history_video_unselect.webp differ diff --git a/app/src/main/res/drawable/selector_ic_video_history.xml b/app/src/main/res/drawable/selector_ic_video_history.xml new file mode 100644 index 0000000000..e81de32744 --- /dev/null +++ b/app/src/main/res/drawable/selector_ic_video_history.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_home_wrapper.xml b/app/src/main/res/layout/fragment_main_home_wrapper.xml index 16601f4e2a..b7648130d3 100644 --- a/app/src/main/res/layout/fragment_main_home_wrapper.xml +++ b/app/src/main/res/layout/fragment_main_home_wrapper.xml @@ -60,7 +60,7 @@ android:layout_height="8dp" android:layout_alignParentBottom="true" app:disableIndicatorScaling="true" - app:indicatorDrawable="@drawable/ic_home_tab_indicator_colorful" /> + app:indicatorDrawable="@drawable/ic_forum_tab_indicator" /> + android:paddingTop = "16dp" >