From 5e15555ad4604f810918229b9fc9167677ebc72f Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Fri, 19 Nov 2021 15:07:04 +0100 Subject: [PATCH] Fix deprecations --- .../protect/card_locker/LoyaltyCardEditActivity.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index f22db265e..144b172af 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -68,6 +68,7 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; import androidx.core.content.FileProvider; import androidx.exifinterface.media.ExifInterface; import androidx.fragment.app.DialogFragment; @@ -678,10 +679,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { } private void setCropperTheme() { - mCropperOptions.setToolbarColor(getResources().getColor(R.color.colorPrimary)); - mCropperOptions.setStatusBarColor(getResources().getColor(R.color.colorPrimaryDark)); + mCropperOptions.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary)); + mCropperOptions.setStatusBarColor(ContextCompat.getColor(this, R.color.colorPrimaryDark)); mCropperOptions.setToolbarWidgetColor(Color.WHITE); - mCropperOptions.setActiveControlsWidgetColor(getResources().getColor(R.color.colorPrimary)); + mCropperOptions.setActiveControlsWidgetColor(ContextCompat.getColor(this, R.color.colorPrimary)); } @Override @@ -895,7 +896,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { protected void setColorFromIcon() { Object icon = thumbnail.getTag(); if (icon != null && (icon instanceof Bitmap)) { - updateTempState(LoyaltyCardField.headerColor, new Palette.Builder((Bitmap) icon).generate().getDominantColor(tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : getResources().getColor(R.color.colorPrimary))); + updateTempState(LoyaltyCardField.headerColor, new Palette.Builder((Bitmap) icon).generate().getDominantColor(tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : ContextCompat.getColor(this, R.color.colorPrimary))); } else { Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist"); }