Don't cache image header colour

Simplifies the logic for the icon -> front -> back fallback
CatimaLoyalty · Jun 15, 2024 · 31836a2 · 31836a2
1 parent 630a096
commit 31836a2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -690,7 +690,6 @@ public void onUserDismissedSelector() {
                         mIconUnsaved = true;
                         setCardImage(thumbnail, Utils.resizeBitmap(bitmap, Utils.BITMAP_SIZE_SMALL), false);
                         thumbnail.setBackgroundColor(Color.TRANSPARENT);
-                        setColorFromIcon();
                     }
                     Log.d("cropper", "mRequestedImage: " + mRequestedImage);
                     mCropperFinishedType = mRequestedImage;
@@ -984,20 +983,6 @@ protected void onResume() {
         }
     }
 
-    protected void setColorFromIcon() {
-        Object icon = thumbnail.getTag();
-        if (icon != null && (icon instanceof Bitmap)) {
-            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, Utils.getHeaderColor(this, tempLoyaltyCard));
-
-            updateTempState(LoyaltyCardField.headerColor, headerColor);
-
-            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
-            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
-        } else {
-            Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist");
-        }
-    }
-
     protected void setCardImage(ImageView imageView, Bitmap bitmap, boolean applyFallback) {
         imageView.setTag(bitmap);
 

diff --git a/app/src/main/java/protect/card_locker/Utils.java b/app/src/main/java/protect/card_locker/Utils.java
@@ -935,7 +935,7 @@ public static String linkify(final String input) {
      * @return background colour
      */
     public static int setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
-        int headerColor = getHeaderColor(context, loyaltyCard);
+        int headerColor = getHeaderColorFromImage(icon, getHeaderColor(context, loyaltyCard));
         backgroundOrIcon.setImageBitmap(icon);
         backgroundOrIcon.setBackgroundColor(headerColor);