From f77d26ad219b0cb9b9abf01b1de97c0c5832d89e Mon Sep 17 00:00:00 2001 From: Alexey Rochev Date: Sun, 2 Jun 2024 22:17:10 +0300 Subject: [PATCH] Replace ContextCompat.getDrawable with AppCompatResources.getDrawable --- .../redreader/adapters/AccountListAdapter.kt | 6 ++--- .../adapters/MainMenuListingManager.java | 23 +++++++++++-------- .../adapters/SessionListAdapter.java | 6 +++-- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/quantumbadger/redreader/adapters/AccountListAdapter.kt b/src/main/java/org/quantumbadger/redreader/adapters/AccountListAdapter.kt index 07540f25c..906277ed6 100644 --- a/src/main/java/org/quantumbadger/redreader/adapters/AccountListAdapter.kt +++ b/src/main/java/org/quantumbadger/redreader/adapters/AccountListAdapter.kt @@ -25,7 +25,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity -import androidx.core.content.ContextCompat +import androidx.appcompat.content.res.AppCompatResources import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -47,9 +47,9 @@ class AccountListAdapter(private val context: AppCompatActivity, private val fra init { val attr = context.obtainStyledAttributes(intArrayOf(R.attr.rrIconAdd, R.attr.rrIconPerson)) - rrIconAdd = ContextCompat.getDrawable(context, attr.getResourceId(0, 0)) + rrIconAdd = AppCompatResources.getDrawable(context, attr.getResourceId(0, 0)) //noinspection ResourceType: bug in Lint - rrIconUser = ContextCompat.getDrawable(context, attr.getResourceId(1, 0)) + rrIconUser = AppCompatResources.getDrawable(context, attr.getResourceId(1, 0)) attr.recycle() } diff --git a/src/main/java/org/quantumbadger/redreader/adapters/MainMenuListingManager.java b/src/main/java/org/quantumbadger/redreader/adapters/MainMenuListingManager.java index 1fa8fb2b4..2a7b96ded 100644 --- a/src/main/java/org/quantumbadger/redreader/adapters/MainMenuListingManager.java +++ b/src/main/java/org/quantumbadger/redreader/adapters/MainMenuListingManager.java @@ -27,12 +27,15 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.Toast; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; -import androidx.core.content.ContextCompat; +import androidx.appcompat.content.res.AppCompatResources; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import org.quantumbadger.redreader.R; import org.quantumbadger.redreader.account.RedditAccount; import org.quantumbadger.redreader.account.RedditAccountManager; @@ -159,19 +162,19 @@ public MainMenuListingManager( R.attr.rrIconAccountSearch }); - rrIconPerson = ContextCompat.getDrawable(activity, attr.getResourceId(0, 0)); - rrIconEnvOpen = ContextCompat.getDrawable(activity, attr.getResourceId(1, 0)); - rrIconSentMessages = ContextCompat.getDrawable(activity, attr.getResourceId(2,0)); - rrIconSend = ContextCompat.getDrawable(activity, attr.getResourceId(3, 0)); - rrIconStarFilled = ContextCompat.getDrawable( + rrIconPerson = AppCompatResources.getDrawable(activity, attr.getResourceId(0, 0)); + rrIconEnvOpen = AppCompatResources.getDrawable(activity, attr.getResourceId(1, 0)); + rrIconSentMessages = AppCompatResources.getDrawable(activity, attr.getResourceId(2,0)); + rrIconSend = AppCompatResources.getDrawable(activity, attr.getResourceId(3, 0)); + rrIconStarFilled = AppCompatResources.getDrawable( activity, attr.getResourceId(4, 0)); - rrIconCross = ContextCompat.getDrawable(activity, attr.getResourceId(5, 0)); - rrIconUpvote = ContextCompat.getDrawable(activity, attr.getResourceId(6, 0)); - rrIconDownvote = ContextCompat.getDrawable( + rrIconCross = AppCompatResources.getDrawable(activity, attr.getResourceId(5, 0)); + rrIconUpvote = AppCompatResources.getDrawable(activity, attr.getResourceId(6, 0)); + rrIconDownvote = AppCompatResources.getDrawable( activity, attr.getResourceId(7, 0)); - rrIconAccountSearch = Objects.requireNonNull(ContextCompat.getDrawable( + rrIconAccountSearch = Objects.requireNonNull(AppCompatResources.getDrawable( activity, attr.getResourceId(8, 0))); diff --git a/src/main/java/org/quantumbadger/redreader/adapters/SessionListAdapter.java b/src/main/java/org/quantumbadger/redreader/adapters/SessionListAdapter.java index ce3e2ac20..94305481b 100644 --- a/src/main/java/org/quantumbadger/redreader/adapters/SessionListAdapter.java +++ b/src/main/java/org/quantumbadger/redreader/adapters/SessionListAdapter.java @@ -23,9 +23,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.appcompat.app.AppCompatDialogFragment; -import androidx.core.content.ContextCompat; +import androidx.appcompat.content.res.AppCompatResources; import androidx.recyclerview.widget.RecyclerView; + import org.quantumbadger.redreader.R; import org.quantumbadger.redreader.account.RedditAccountManager; import org.quantumbadger.redreader.activities.SessionChangeListener; @@ -70,7 +72,7 @@ public SessionListAdapter( final TypedArray attr = context.obtainStyledAttributes(new int[] {R.attr.rrIconRefresh,}); - rrIconRefresh = ContextCompat.getDrawable(context, attr.getResourceId(0, 0)); + rrIconRefresh = AppCompatResources.getDrawable(context, attr.getResourceId(0, 0)); attr.recycle(); }