diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 71bf86b4e3..33202c680d 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -36,10 +36,10 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.content.res.AppCompatResources; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.common.DefaultUrlHandler; @@ -594,7 +594,7 @@ public class MainActivity extends BaseActivity { SimpleDraweeView adImage = findViewById(R.id.adImage); startAdContainer.setVisibility(View.VISIBLE); jumpDetailBtn.setText(ad.getDesc()); - ExtensionsKt.setDrawableEnd(jumpDetailBtn, VectorDrawableCompat.create(getResources(), R.drawable.ic_startup_ad_arrow, null), null, null); + ExtensionsKt.setDrawableEnd(jumpDetailBtn, AppCompatResources.getDrawable(this, R.drawable.ic_startup_ad_arrow), null, null); ImageUtils.display(adImage, ad.getImg()); startAdContainer.setOnClickListener(v -> { // do nothing 只是为了点击拦截事件，避免传递到下面的页面 diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt index 3b9a29bcc7..9a43acb6c5 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.amway.search import android.os.Bundle import android.view.View +import androidx.appcompat.content.res.AppCompatResources import androidx.recyclerview.widget.LinearLayoutManager -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentAmwaySearchDefaultBinding @@ -65,11 +65,12 @@ class AmwaySearchDefaultFragment : SearchDefaultFragment() { headTitle.textSize = 16F headActionTv.text = "清空" headActionTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) - headActionTv.setDrawableStart(VectorDrawableCompat.create( - resources, - R.drawable.search_history_delete, - null - )) + headActionTv.setDrawableStart( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.search_history_delete + ) + ) headActionTv.setOnClickListener { DialogHelper.showCenterWarningDialog(requireContext(), "清空记录", "确定清空历史搜索记录？", confirmClickCallback = { mSearchDao.deleteAll() diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultFragment.kt index cfe313d4c8..e05eb7838b 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchDefaultFragment.kt @@ -2,8 +2,8 @@ package com.gh.gamecenter.forum.search import android.os.Bundle import android.view.View +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.FragmentSearchDefaultBinding @@ -75,11 +75,12 @@ class ForumOrUserSearchDefaultFragment : SearchDefaultFragment() { headTitle.textSize = 16F headActionTv.text = "清空" headActionTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) - headActionTv.setDrawableStart(VectorDrawableCompat.create( - resources, - R.drawable.search_history_delete, - null - )) + headActionTv.setDrawableStart( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.search_history_delete + ) + ) headActionTv.setOnClickListener { DialogHelper.showCenterWarningDialog(requireContext(), "清空记录", "确定清空历史搜索记录？", confirmClickCallback = { mSearchDao.deleteAll() diff --git a/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt index bf045559b7..056bf74e8c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt @@ -8,11 +8,11 @@ import android.view.Gravity import android.view.View import android.widget.LinearLayout import android.widget.TextView +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import com.gh.gamecenter.feature.view.DownloadButton import com.gh.gamecenter.feature.view.GameIconView -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.airbnb.lottie.LottieAnimationView import com.airbnb.lottie.LottieDrawable import com.gh.gamecenter.R @@ -147,11 +147,7 @@ class RankGameItemUi(override val ctx: Context) : Ui { gravity = Gravity.CENTER text = "展开" setTextColor(ContextCompat.getColor(context, R.color.white)) - setDrawableEnd( - VectorDrawableCompat.create( - resources, R.drawable.ic_jump_universal, null - ) - ) + setDrawableEnd(AppCompatResources.getDrawable(context, R.drawable.ic_jump_universal)) compoundDrawablePadding = dip(2) visibility = View.GONE } diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt index ff0bfe9f45..116fba9dc3 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt @@ -10,9 +10,9 @@ import android.view.View import android.widget.LinearLayout import android.widget.Space import android.widget.TextView +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.airbnb.lottie.LottieAnimationView import com.airbnb.lottie.LottieDrawable import com.facebook.drawee.view.SimpleDraweeView @@ -286,11 +286,7 @@ class GameItemUi(override val ctx: Context) : Ui { gravity = Gravity.CENTER text = "展开" setTextColor(ContextCompat.getColor(context, R.color.white)) - setDrawableEnd( - VectorDrawableCompat.create( - resources, R.drawable.ic_jump_universal, null - ) - ) + setDrawableEnd(AppCompatResources.getDrawable(context, R.drawable.ic_jump_universal)) compoundDrawablePadding = dip(2) visibility = View.GONE } diff --git a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt index 8f024798b3..322c34ff06 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt @@ -7,6 +7,7 @@ import android.os.* import android.text.TextUtils import android.view.MotionEvent import android.view.View +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintSet import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider @@ -14,7 +15,6 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.PagerSnapHelper import androidx.recyclerview.widget.RecyclerView -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import androidx.viewpager2.widget.ViewPager2 import com.gh.common.constant.Config import com.gh.common.databind.BindingAdapters @@ -871,11 +871,36 @@ class HaloPersonalFragment : BaseLazyFragment() { myCollectionTv.setTextColor(R.color.text_title.toColor(requireContext())) historyTv.setTextColor(R.color.text_title.toColor(requireContext())) myPostTv.setTextColor(R.color.text_title.toColor(requireContext())) - myGameTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_my_game, null)) - myGameCollectionTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_my_game_collection, null)) - myCollectionTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_my_collection, null)) - historyTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_history, null)) - myPostTv.setDrawableTop(VectorDrawableCompat.create(resources, R.drawable.ic_personal_my_post, null)) + myGameTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_my_game + ) + ) + myGameCollectionTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_my_game_collection + ) + ) + myCollectionTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_my_collection + ) + ) + historyTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_history + ) + ) + myPostTv.setDrawableTop( + AppCompatResources.getDrawable( + requireContext(), + R.drawable.ic_personal_my_post + ) + ) } } } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt index 48ab87d6da..bc62a8bbca 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt @@ -12,8 +12,8 @@ import android.view.View import android.view.ViewGroup import android.widget.CheckedTextView import android.widget.TextView +import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.gh.common.constant.Config import com.gh.common.exposure.ExposureManager import com.gh.common.filter.RegionSettingHelper @@ -144,10 +144,9 @@ open class SearchDefaultFragment : BaseFragment() { headActionTv.text = "清空" headActionTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) headActionTv.setDrawableStart( - VectorDrawableCompat.create( - resources, - R.drawable.search_history_delete, - null + AppCompatResources.getDrawable( + requireContext(), + R.drawable.search_history_delete ) ) headActionTv.setOnClickListener { diff --git a/module_common/src/main/java/com/gh/gamecenter/common/view/ClearEditTextNormal.java b/module_common/src/main/java/com/gh/gamecenter/common/view/ClearEditTextNormal.java index 50e3df5ca3..1ac4bfb58b 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/view/ClearEditTextNormal.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/view/ClearEditTextNormal.java @@ -12,7 +12,7 @@ import android.view.animation.Animation; import android.view.animation.CycleInterpolator; import android.view.animation.TranslateAnimation; -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; +import androidx.appcompat.content.res.AppCompatResources; import com.gh.gamecenter.common.R; import com.gh.gamecenter.core.utils.DisplayUtils; @@ -49,7 +49,7 @@ public class ClearEditTextNormal extends androidx.appcompat.widget.AppCompatEdit mClearDrawable = getCompoundDrawables()[2]; if (mClearDrawable == null) { // throw new NullPointerException("You can add drawableRight attribute in XML"); - mClearDrawable = VectorDrawableCompat.create(getResources(), R.drawable.icon_input_close, null); + mClearDrawable = AppCompatResources.getDrawable(getContext(), R.drawable.icon_input_close); } // mClearDrawable.setBounds(0, 0, mClearDrawable.getIntrinsicWidth(), mClearDrawable.getIntrinsicHeight()); diff --git a/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt index f0b40c422c..cdc5804e75 100644 --- a/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt @@ -14,9 +14,9 @@ import android.view.ViewGroup import android.view.Window import android.widget.CheckBox import android.widget.TextView +import androidx.appcompat.content.res.AppCompatResources import androidx.core.text.getSpans import androidx.core.view.doOnAttach -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.alibaba.android.arouter.launcher.ARouter import com.cmic.gen.sdk.auth.GenAuthnHelper import com.cmic.gen.sdk.auth.GenTokenListener @@ -362,13 +362,13 @@ object QuickLoginHelper { setOnCheckedChangeListener { buttonView, isChecked -> if (isChecked) { buttonView.background = - VectorDrawableCompat.create(context.resources, R.drawable.ic_selector_selected, null) + AppCompatResources.getDrawable(context, R.drawable.ic_selector_selected) } else { buttonView.background = - VectorDrawableCompat.create(context.resources, R.drawable.ic_selector_default, null) + AppCompatResources.getDrawable(context, R.drawable.ic_selector_default) } } - background = VectorDrawableCompat.create(context.resources, R.drawable.ic_selector_default, null) + background = AppCompatResources.getDrawable(context, R.drawable.ic_selector_default) } val privacyTv = getChildAt(1) as? TextView