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 bb3e562a36..90460eb8e8 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java @@ -14,6 +14,7 @@ import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; import com.gh.common.util.CollectionUtils; import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.view.DrawableView; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.common.viewholder.FooterViewHolder; @@ -232,6 +233,11 @@ public class AnswerAdapter extends ListAdapter implements ISyncAda } }); + mPopupBinding.checkAllCb.setCompoundDrawablesWithIntrinsicBounds( + DrawableView.getCheckSelectorDrawable( + mContext + ), null, null, null + ); mPopupBinding.checkAllCb.setOnClickListener(v -> { if (mPopupBinding.checkAllCb.isChecked()) { selectItems.clear(); 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 29fb72f981..92e1865e47 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -16,6 +16,7 @@ import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.common.constant.ItemViewType; import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.view.DrawableView; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.NewsUtils; @@ -361,6 +362,11 @@ public class ArticleAdapter extends ListAdapter { } }); + mPopupBinding.checkAllCb.setCompoundDrawablesWithIntrinsicBounds( + DrawableView.getCheckSelectorDrawable( + mContext + ), null, null, null + ); mPopupBinding.checkAllCb.setOnClickListener(v -> { if (mPopupBinding.checkAllCb.isChecked()) { selectItems.clear(); 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 4f648ab149..dc065b10d7 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt @@ -18,6 +18,7 @@ import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.databinding.PopupHistoryOptionBinding import com.gh.gamecenter.common.entity.CommunityEntity +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.history.ManageOption import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity @@ -172,6 +173,11 @@ class CommunityArticleAdapter( }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } + mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds( + DrawableView.getCheckSelectorDrawable( + mContext + ), null, null, null + ) mPopupBinding?.checkAllCb?.setOnClickListener { if (mPopupBinding?.checkAllCb?.isChecked == true) { selectItems.clear() 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 88d788f1eb..594922a157 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt @@ -24,6 +24,7 @@ import com.gh.gamecenter.adapter.viewholder.GameCollectionItemViewHolder import com.gh.gamecenter.common.baselist.ListAdapter import com.gh.gamecenter.collection.GamesCollectionFragment.Companion.TYPE_USER import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.ItemGameCollectionFlexTagBinding import com.gh.gamecenter.databinding.PopupHistoryOptionBinding @@ -424,6 +425,11 @@ class GamesCollectionAdapter( }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } + mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds( + DrawableView.getCheckSelectorDrawable( + mContext + ), null, null, null + ) mPopupBinding?.checkAllCb?.setOnClickListener { if (mPopupBinding?.checkAllCb?.isChecked == true) { selectItems.clear() 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 c0208f049d..1be5a7f3ae 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt @@ -3,6 +3,7 @@ package com.gh.gamecenter.collection import android.app.Activity import android.content.Context import android.content.Intent +import android.graphics.drawable.StateListDrawable import android.view.Gravity import android.view.LayoutInflater import android.view.View @@ -17,6 +18,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.common.viewholder.FooterViewHolder import com.gh.gamecenter.common.baselist.ListAdapter import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.databinding.PopupHistoryOptionBinding import com.gh.gamecenter.databinding.VideoNewItemBinding import com.gh.gamecenter.entity.MyVideoEntity @@ -166,6 +168,11 @@ class VideoAdapter( }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } + mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds( + DrawableView.getCheckSelectorDrawable( + mContext + ), null, null, null + ) mPopupBinding?.checkAllCb?.setOnClickListener { if (mPopupBinding?.checkAllCb?.isChecked == true) { selectItems.clear() diff --git a/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt index 05d14be663..c1b312d3e5 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt @@ -32,6 +32,7 @@ class GameItemViewHolder(var binding: GameItemBinding) : BaseRecyclerViewHolder< ) { binding.run { root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) + selectIv.setImageDrawable(DrawableView.getCheckSelectorDrawable(root.context)) gameKaifuType.setBackgroundColor(R.color.theme.toColor(root.context)) gameName.setTextColor(R.color.text_title.toColor(root.context)) gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) 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 087bb2f957..a4d0c570d6 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt @@ -16,6 +16,7 @@ import com.gh.gamecenter.common.viewholder.FooterViewHolder import com.gh.gamecenter.adapter.viewholder.GameViewHolder import com.gh.gamecenter.common.baselist.ListAdapter import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.GameItemBinding import com.gh.gamecenter.databinding.PopupHistoryOptionBinding @@ -149,6 +150,11 @@ class HistoryGameListAdapter(context: Context, private val mViewModel: HistoryGa }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) } + mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds( + DrawableView.getCheckSelectorDrawable( + mContext + ), null, null, null + ) mPopupBinding?.checkAllCb?.setOnClickListener { if (mPopupBinding?.checkAllCb?.isChecked == true) { selectItems.clear() diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt index 8a40c219ab..b704dc5fca 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt @@ -36,6 +36,7 @@ import com.gh.gamecenter.common.baselist.ListAdapter import com.gh.gamecenter.common.callback.BiCallback import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.SimulatorGameItemBinding import com.gh.gamecenter.databinding.SimulatorHeaderViewBinding @@ -199,6 +200,7 @@ class SimulatorGameListAdapter( recommendStar.rating = gameEntity.recommendStar.toFloat() } gameItemIncluded.recentPlayedTag.goneIf(!gameEntity.isRecentlyPlayed) + gameItemIncluded.selectIv.setImageDrawable(DrawableView.getCheckSelectorDrawable(mContext)) gameItemIncluded.selectIv.goneIf(!mShowSelectFlag) gameItemIncluded.selectIv.isChecked = mSelectList[position - 1] gameItemIncluded.selectIv.setOnClickListener { diff --git a/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt b/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt index 1e8ef50fd7..8256b02dab 100644 --- a/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt +++ b/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt @@ -25,6 +25,7 @@ import com.gh.gamecenter.common.baselist.LoadType import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.core.runOnIoThread import com.gh.gamecenter.core.utils.CurrentActivityHolder @@ -136,7 +137,7 @@ class VDownloadManagerAdapter( holder.binding.descTv.goneIf(!mViewModel.isTypeDownloaded() || gameEntity.des?.isEmpty() == true) holder.binding.descTv.text = gameEntity.des - holder.binding.selectIv.setImageDrawable(R.drawable.selector_ic_simulator.toDrawable(mContext)) + holder.binding.selectIv.setImageDrawable(DrawableView.getCheckSelectorDrawable(mContext)) holder.binding.selectIv.goneIf(mCurrentOption == ManageOption.OPTION_MANAGER) holder.binding.selectIv.isChecked = selectItems.contains(gameEntity.id) @@ -242,6 +243,11 @@ class VDownloadManagerAdapter( extraConfig = DialogHelper.Config(centerTitle = true) ) } + mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds( + DrawableView.getCheckSelectorDrawable( + mContext + ), null, null, null + ) mPopupBinding?.checkAllCb?.setOnClickListener { if (mPopupBinding?.checkAllCb?.isChecked == true) { selectItems.clear() @@ -261,7 +267,7 @@ class VDownloadManagerAdapter( checkAllCb.setTextColor(R.color.text_title.toColor(mContext)) selectNumTv.setTextColor(R.color.theme_font.toColor(mContext)) checkAllCb.setCompoundDrawablesWithIntrinsicBounds( - R.drawable.selector_ic_simulator.toDrawable(mContext), + DrawableView.getCheckSelectorDrawable(mContext), null, null, null diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_selector_default.webp b/app/src/main/res/drawable-night-xxxhdpi/ic_selector_default.webp deleted file mode 100644 index 413ca90ee1..0000000000 Binary files a/app/src/main/res/drawable-night-xxxhdpi/ic_selector_default.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_selector_default.webp b/app/src/main/res/drawable-xxxhdpi/ic_selector_default.webp deleted file mode 100644 index 20bfca84c3..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_selector_default.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_video_setting_select.webp b/app/src/main/res/drawable-xxxhdpi/ic_video_setting_select.webp deleted file mode 100644 index ac383d42cb..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_video_setting_select.webp and /dev/null differ diff --git a/app/src/main/res/drawable/selector_ic_simulator.xml b/app/src/main/res/drawable/selector_ic_simulator.xml deleted file mode 100644 index cae09c0a7d..0000000000 --- a/app/src/main/res/drawable/selector_ic_simulator.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/category_game_item.xml b/app/src/main/res/layout/category_game_item.xml index 1ea9217a64..0d02708e98 100644 --- a/app/src/main/res/layout/category_game_item.xml +++ b/app/src/main/res/layout/category_game_item.xml @@ -36,8 +36,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/game_order" app:layout_constraintRight_toLeftOf="@+id/gameIconView" - app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/selector_ic_simulator" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> + android:textColor="@color/text_title" /> - - - - \ No newline at end of file diff --git a/module_login/src/main/res/layout/fragment_login.xml b/module_login/src/main/res/layout/fragment_login.xml index 19077c2b24..d8be02066f 100644 --- a/module_login/src/main/res/layout/fragment_login.xml +++ b/module_login/src/main/res/layout/fragment_login.xml @@ -184,8 +184,7 @@ android:id="@+id/checkIv" android:layout_width="24dp" android:layout_height="24dp" - android:padding="4dp" - android:src="@drawable/selector_login_checkbox" /> + android:padding="4dp" />