From 16a187f7d031a13cfdcd6f2c8e2f62b6fd08b099 Mon Sep 17 00:00:00 2001 From: jack Date: Mon, 24 Jan 2022 18:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?= =?UTF-8?q?.6.0=E3=80=91=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96=E6=B1=87?= =?UTF-8?q?=E6=80=BB12=E6=9C=88=E7=AC=AC5=E5=91=A8(0124UI=E6=B5=8B?= =?UTF-8?q?=E8=AF=951,3)=20https://git.shanqu.cc/pm/halo-app-issues/-/issu?= =?UTF-8?q?es/1672?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/collection/AnswerAdapter.java | 3 ++- .../gh/gamecenter/collection/ArticleAdapter.java | 3 ++- .../collection/CommunityArticleAdapter.kt | 3 ++- .../collection/GamesCollectionAdapter.kt | 3 ++- .../com/gh/gamecenter/collection/VideoAdapter.kt | 3 ++- .../fragment/HomeSearchToolWrapperFragment.kt | 6 +++--- .../gamecenter/history/HistoryGameListAdapter.kt | 3 ++- .../ic_history_video_unselect.webp | Bin 0 -> 1722 bytes .../res/drawable/selector_ic_video_history.xml | 7 +++++++ .../res/layout/fragment_main_home_wrapper.xml | 2 +- app/src/main/res/layout/toolbox_item.xml | 4 ++-- app/src/main/res/layout/video_new_item.xml | 2 +- 12 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_history_video_unselect.webp create mode 100644 app/src/main/res/drawable/selector_ic_video_history.xml 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 0000000000000000000000000000000000000000..202d14ed51feed774c340024b60dcd6b970d6796 GIT binary patch literal 1722 zcmV;r21WT&Nk&Gp1^@t8MM6+kP&il$0000G0000_002(_06|PpNDl)500Ae$xNRfH z$&)*gc|lLD!ock;gD&-C(WXLGq4jGd#)G>-E|o%7<} zI%(xq?~WSNr6M8!C0mIU!p5_2Icy#*$c+38&7tr1ye{)|-17_vSF17?@oM1d^^Rpu zs&}5=|LbL$n`NS>7^*T4OCO%w`?eKAz?1w~ve{Yt$;3uyh5b`k7-gP6QD$YUooW5< zN`dS~fUqUAvF4rL>QX4YdB@qVE_shWRi$9U6Tr_bFQ|I&_PAh$L(F_XX88Jd-t`hr zW_VY_RGVXfx2lvv@Ln)2pf-BIulH_cKy=WX67pHD80|`F?Bd{gqDbO^Gbs@=?@3v% zmL*a5DkWN^^Qm7Wt|uq-9BJOF~HQ27O}q;#%; z=>6&U91K^bbm9=$%M4NnO;JD-2x3<2J2)@}1fX9tFNQh`q5!i0&P416xHT2r0nzLW zI5ZU;IS97$=NLCc1u?+i%D#h7Q9=avvy_yY5(04g;NVh}5P*kQ2S=ua?1|wU*byZJ z;JXEEiV|=TyAGB`3Clotf-1{U7X*ag0eiMFHh>rI77!0x$ES#T8R`z?IN$r_%ppc+Sy#L24m;wGL7TBQRkv21+sYZ z>*gc|lY*)2rF}OuA>Avdh}4psufOS!S%^tZN@QjK?BVsh)g94|79P&_S7crQ09H^q zAbbM=0FV{{odGIP08juvjXIh~r6Z!DFI)O>pb?2_02SqZet%E=a_7tS<9dB z`S1O|?%kAq2!B?8@tKvbiFPCk2;}`cZvH=I(XmkBB%}KZ8Ae7*GrFn}gN-!HYeG{t zS2M3ttQPMKO(pc5PCoxz9Jh*6LHFlkckb`u$|ynISH5CFAix0r_kQ01{{=%z9{u^b zH&oq|M?w*N!-n(cl zzqfTRVj;`5J9@dveI$)=;hJ>gt93tB?`z*}{7rCQG~$axzjbd0nIK(sRFqF>{xY{hbEw+EQFJ!W(q#%gIn*fjSd;x@Lq8NUowSbz=j?R)t z?i1@UdS4=z=I}(qPOQHbgit_Bk!)F#UeRM`*^8A}qxO5HH};dfQred;;E=xdCvRfQ zYKhxmrw1bB;E#Nhh)lap^6c Q^)f*fq5gXVdVT-^0Nvtca{vGU literal 0 HcmV?d00001 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" >