Fully replace custom color roles with attributes and implement dynami…

…c contrast for custom colors
patzly · Dec 27, 2023 · 05911b9 · 05911b9
1 parent cff3fab
commit 05911b9
Show file tree

Hide file tree

Showing 28 changed files with 478 additions and 749 deletions.
diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ChoreEntryAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ChoreEntryAdapter.java
@@ -150,15 +150,13 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
           ResourcesCompat.getFont(context, R.font.jost_medium)
       );
 
-      ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
-      ColorRoles colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
       int color;
       if (days < 0) {
         color = ResUtil.getColorAttr(context, R.attr.colorError);
       } else if (days == 0) {
-        color = colorBlue.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomBlue);
       } else {
-        color = colorYellow.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
       }
       holder.binding.days.setTextColor(color);
       holder.binding.daysHuman.setTextColor(color);

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/MealPlanEntryAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/MealPlanEntryAdapter.java
@@ -267,7 +267,6 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
     binding.timelineView.setPosition(entry.getItemPosition());
 
     Context context = binding.getRoot().getContext();
-    ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
 
     binding.title.setText(entry.getType());
     binding.picture.setVisibility(View.GONE);

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionAdapter.java
@@ -74,9 +74,7 @@ public class RecipePositionAdapter extends
 
   private final PluralUtil pluralUtil;
   private final int maxDecimalPlacesAmount;
-  private final ColorRoles colorGreen;
-  private final ColorRoles colorYellow;
-  private final int colorRed;
+  private final int colorGreen, colorYellow, colorRed;
 
   public RecipePositionAdapter(
       Context context,
@@ -110,8 +108,8 @@ public RecipePositionAdapter(
     this.listener = listener;
     this.pluralUtil = new PluralUtil(context);
 
-    colorGreen = ResUtil.getHarmonizedRoles(context, R.color.green);
-    colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
+    colorGreen = ResUtil.getColorAttr(context, R.attr.colorCustomGreen);
+    colorYellow = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
     colorRed = ResUtil.getColorAttr(context, R.attr.colorError);
   }
 
@@ -262,9 +260,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
             R.drawable.ic_round_check_circle_outline,
             null
         ));
-        holder.binding.imageFulfillment.setImageTintList(
-            ColorStateList.valueOf(colorGreen.getAccent())
-        );
+        holder.binding.imageFulfillment.setImageTintList(ColorStateList.valueOf(colorGreen));
         holder.binding.missing.setVisibility(View.GONE);
       } else {
         holder.binding.fulfilled.setText(R.string.msg_recipes_not_enough);
@@ -276,9 +272,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
             null
         ));
         holder.binding.imageFulfillment.setImageTintList(
-            ColorStateList.valueOf(
-                amountShoppingList >= amountMissing ? colorYellow.getAccent() : colorRed
-            )
+            ColorStateList.valueOf(amountShoppingList >= amountMissing ? colorYellow : colorRed)
         );
         holder.binding.missing.setText(
             context.getString(

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionResolvedAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/RecipePositionResolvedAdapter.java
@@ -80,9 +80,7 @@ public class RecipePositionResolvedAdapter extends
   private final PluralUtil pluralUtil;
   private final int maxDecimalPlacesAmount;
   private final int maxDecimalPlacesPrice;
-  private final ColorRoles colorGreen;
-  private final ColorRoles colorYellow;
-  private final int colorRed;
+  private final int colorGreen, colorYellow, colorRed;
   private final String energyUnit;
   private final String currency;
 
@@ -119,8 +117,8 @@ public RecipePositionResolvedAdapter(
     this.listener = listener;
     this.pluralUtil = new PluralUtil(context);
 
-    colorGreen = ResUtil.getHarmonizedRoles(context, R.color.green);
-    colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
+    colorGreen = ResUtil.getColorAttr(context, R.attr.colorCustomGreen);
+    colorYellow = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
     colorRed = ResUtil.getColorAttr(context, R.attr.colorError);
   }
 
@@ -329,9 +327,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
             R.drawable.ic_round_check_circle_outline,
             null
         ));
-        holder.binding.imageFulfillment.setImageTintList(
-            ColorStateList.valueOf(colorGreen.getAccent())
-        );
+        holder.binding.imageFulfillment.setImageTintList(ColorStateList.valueOf(colorGreen));
         holder.binding.missing.setVisibility(View.GONE);
       } else {
         double amountMissing = conversion != null
@@ -350,9 +346,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
             null
         ));
         holder.binding.imageFulfillment.setImageTintList(
-            ColorStateList.valueOf(
-                amountShoppingList >= amountMissing ? colorYellow.getAccent() : colorRed
-            )
+            ColorStateList.valueOf(amountShoppingList >= amountMissing ? colorYellow : colorRed)
         );
         holder.binding.missing.setText(
             context.getString(

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingListItemAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingListItemAdapter.java
@@ -401,7 +401,6 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
     RowShoppingListItemBinding binding = ((ShoppingListItemViewHolder) viewHolder).binding;
 
     Context context = binding.getRoot().getContext();
-    ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
 
     // NAME
 
@@ -472,8 +471,10 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
       }
       Chip chipAmount = createChip(context, stringBuilderAmount.toString());
       if (item.hasProduct() && missingProductIds.contains(item.getProductIdInt())) {
-        chipAmount.setTextColor(colorBlue.getOnAccentContainer());
-        chipAmount.setChipBackgroundColor(ColorStateList.valueOf(colorBlue.getAccentContainer()));
+        chipAmount.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnCustomBlueContainer));
+        chipAmount.setChipBackgroundColor(ColorStateList.valueOf(
+            ResUtil.getColorAttr(context, R.attr.colorCustomBlueContainer)
+        ));
       }
       if (item.isUndone()) {
         chipAmount.setPaintFlags(chipAmount.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingModeItemAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/ShoppingModeItemAdapter.java
@@ -355,8 +355,6 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
     ShoppingListItem item = (ShoppingListItem) groupedListItem;
     RowShoppingModeItemBinding binding = ((ShoppingItemViewHolder) viewHolder).binding;
 
-    ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
-
     if (useSmallerFonts) {
       int dp8 = UiUtil.dpToPx(binding.name.getContext(), 8);
       binding.card.setContentPadding(dp8, 0, dp8, 0);
@@ -439,8 +437,10 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
       }
       Chip chipAmount = createChip(context, stringBuilderAmount.toString());
       if (item.hasProduct() && missingProductIds.contains(item.getProductIdInt())) {
-        chipAmount.setTextColor(colorBlue.getOnAccentContainer());
-        chipAmount.setChipBackgroundColor(ColorStateList.valueOf(colorBlue.getAccentContainer()));
+        chipAmount.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnCustomBlueContainer));
+        chipAmount.setChipBackgroundColor(ColorStateList.valueOf(
+            ResUtil.getColorAttr(context, R.attr.colorCustomBlueContainer)
+        ));
       }
       if (item.isUndone()) {
         chipAmount.setPaintFlags(chipAmount.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockEntryAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockEntryAdapter.java
@@ -328,16 +328,13 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
           ResourcesCompat.getFont(context, R.font.jost_medium)
       );
 
-      ColorRoles colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
-      ColorRoles colorOrange = ResUtil.getHarmonizedRoles(context, R.color.orange);
-
       int color;
       if (Integer.parseInt(days) >= 0) {
-        color = colorYellow.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
       } else if (product != null && product.getDueDateTypeInt() == StockItem.DUE_TYPE_EXPIRATION) {
         color = ResUtil.getColorAttr(context, R.attr.colorError);
       } else {
-        color = colorOrange.getAccent(); // formally DIRT
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomOrange);
       }
       holder.binding.dueDate.setTextColor(color);
     } else {

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockOverviewItemAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/StockOverviewItemAdapter.java
@@ -349,10 +349,6 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
 
     Context context = holder.binding.getRoot().getContext();
 
-    ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
-    ColorRoles colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
-    ColorRoles colorOrange = ResUtil.getHarmonizedRoles(context, R.color.orange);
-
     holder.binding.flexboxLayout.removeAllViews();
 
     // NAME
@@ -365,7 +361,7 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
         && shoppingListFeatureEnabled) {
       holder.binding.viewOnShoppingList.setVisibility(View.VISIBLE);
       holder.binding.viewOnShoppingList.setBackgroundTintList(
-          ColorStateList.valueOf(colorBlue.getAccent())
+          ColorStateList.valueOf(ResUtil.getColorAttr(context, R.attr.colorCustomBlue))
       );
     } else {
       holder.binding.viewOnShoppingList.setVisibility(View.GONE);
@@ -378,14 +374,16 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
     );
 
     if (activeFields.contains(StockOverviewViewModel.FIELD_AMOUNT)) {
+      int colorBlueContainer = ResUtil.getColorAttr(context, R.attr.colorCustomBlueContainer);
+      int colorOnBlueContainer = ResUtil.getColorAttr(context, R.attr.colorOnCustomBlueContainer);
       StringBuilder stringBuilderAmount = new StringBuilder();
       if (!stockItem.getProduct().getNoOwnStockBoolean()) {
         AmountUtil.addStockAmountNormalInfo(context, pluralUtil, stringBuilderAmount, stockItem,
             quantityUnitStock, maxDecimalPlacesAmount);
         Chip chipAmount = createChip(context, stringBuilderAmount.toString());
         if (missingItemsProductIds.contains(stockItem.getProductId())) {
-          chipAmount.setTextColor(colorBlue.getOnAccentContainer());
-          chipAmount.setChipBackgroundColor(ColorStateList.valueOf(colorBlue.getAccentContainer()));
+          chipAmount.setTextColor(colorOnBlueContainer);
+          chipAmount.setChipBackgroundColor(ColorStateList.valueOf(colorBlueContainer));
         }
         holder.binding.flexboxLayout.addView(chipAmount);
       }
@@ -395,8 +393,8 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
       if (!stringBuilderAmountAggregated.toString().isBlank()) {
         Chip chipAmountAggregated = createChip(context, stringBuilderAmountAggregated.toString());
         if (missingItemsProductIds.contains(stockItem.getProductId())) {
-          chipAmountAggregated.setTextColor(colorBlue.getOnAccentContainer());
-          chipAmountAggregated.setChipBackgroundColor(ColorStateList.valueOf(colorBlue.getAccentContainer()));
+          chipAmountAggregated.setTextColor(colorOnBlueContainer);
+          chipAmountAggregated.setChipBackgroundColor(ColorStateList.valueOf(colorBlueContainer));
         }
         holder.binding.flexboxLayout.addView(chipAmountAggregated);
       }
@@ -419,11 +417,15 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
       if (Integer.parseInt(days) <= daysExpiringSoon
           && !stockItem.getProduct().getNoOwnStockBoolean()) {  // don't color days text if product has no own stock (children will be colored)
         if (Integer.parseInt(days) >= 0) {
-          chipDate.setTextColor(colorYellow.getOnAccentContainer());
-          chipDate.setChipBackgroundColor(ColorStateList.valueOf(colorYellow.getAccentContainer()));
+          chipDate.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnCustomYellowContainer));
+          chipDate.setChipBackgroundColor(ColorStateList.valueOf(
+              ResUtil.getColorAttr(context, R.attr.colorCustomYellowContainer)
+          ));
         } else if (stockItem.getDueTypeInt() == StockItem.DUE_TYPE_BEST_BEFORE) {
-          chipDate.setTextColor(colorOrange.getOnAccentContainer());
-          chipDate.setChipBackgroundColor(ColorStateList.valueOf(colorOrange.getAccentContainer())); // formally DIRT
+          chipDate.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnCustomOrangeContainer));
+          chipDate.setChipBackgroundColor(ColorStateList.valueOf(
+              ResUtil.getColorAttr(context, R.attr.colorCustomOrangeContainer)
+          ));
         } else {
           chipDate.setTextColor(ResUtil.getColorAttr(context, R.attr.colorOnErrorContainer));
           chipDate.setChipBackgroundColor(

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/adapter/TaskEntryAdapter.java b/app/src/main/java/xyz/zedler/patrick/grocy/adapter/TaskEntryAdapter.java
@@ -154,15 +154,13 @@ public void onBindViewHolder(@NonNull final ViewHolder viewHolder, int positionD
           ResourcesCompat.getFont(context, R.font.jost_medium)
       );
 
-      ColorRoles colorBlue = ResUtil.getHarmonizedRoles(context, R.color.blue);
-      ColorRoles colorYellow = ResUtil.getHarmonizedRoles(context, R.color.yellow);
       int color;
       if (days < 0) {
         color = ResUtil.getColorAttr(context, R.attr.colorError);
       } else if (days == 0) {
-        color = colorBlue.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomBlue);
       } else {
-        color = colorYellow.getAccent();
+        color = ResUtil.getColorAttr(context, R.attr.colorCustomYellow);
       }
       holder.binding.days.setTextColor(color);
     } else {

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ConsumeFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/ConsumeFragment.java
@@ -210,13 +210,13 @@ public void onViewCreated(@Nullable View view, @Nullable Bundle savedInstanceSta
             || viewModel.isProductWillBeFilled()) && viewModel.getFormData().isScannerVisible()
     );
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
+    int colorBlue = ResUtil.getColorAttr(activity, R.attr.colorCustomBlue);
     viewModel.getQuickModeEnabled().observe(
         getViewLifecycleOwner(), value -> binding.toolbar.setTitleTextColor(
-            value ? roles.getAccent() : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
+            value ? colorBlue : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
         )
     );
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(colorBlue));
     viewModel.getFormData().getQuantityUnitErrorLive().observe(
         getViewLifecycleOwner(), value -> binding.textQuantityUnit.setTextColor(
             ResUtil.getColorAttr(activity, value ? R.attr.colorError : R.attr.colorOnSurfaceVariant)

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/InventoryFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/InventoryFragment.java
@@ -186,14 +186,14 @@ public void onViewCreated(@Nullable View view, @Nullable Bundle savedInstanceSta
             || viewModel.isProductWillBeFilled()) && viewModel.getFormData().isScannerVisible()
     );
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
+    int colorBlue = ResUtil.getColorAttr(activity, R.attr.colorCustomBlue);
     viewModel.getQuickModeEnabled().observe(
         getViewLifecycleOwner(), value -> binding.toolbar.setTitleTextColor(
-            value ? roles.getAccent() : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
+            value ? colorBlue : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
         )
     );
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
-    binding.textInputPurchasePrice.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(colorBlue));
+    binding.textInputPurchasePrice.setHelperTextColor(ColorStateList.valueOf(colorBlue));
     viewModel.getFormData().getDueDateErrorLive().observe(
         getViewLifecycleOwner(), value -> binding.textDueDate.setTextColor(
             ResUtil.getColorAttr(activity, value ? R.attr.colorError : R.attr.colorOnSurfaceVariant)

diff --git a/...src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatBarcodesEditFragment.java b/...src/main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatBarcodesEditFragment.java
@@ -134,8 +134,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       viewModel.getInfoFullscreenLive().setValue(infoFullscreen);
     });
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(
+        ResUtil.getColorAttr(activity, R.attr.colorCustomBlue)
+    ));
 
     embeddedFragmentScanner.setScannerVisibilityLive(
         viewModel.getFormData().getScannerVisibilityLive()

diff --git a/.../main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatConversionsEditFragment.java b/.../main/java/xyz/zedler/patrick/grocy/fragment/MasterProductCatConversionsEditFragment.java
@@ -150,8 +150,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       viewModel.getInfoFullscreenLive().setValue(infoFullscreen);
     });
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
-    binding.textInputFactor.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputFactor.setHelperTextColor(ColorStateList.valueOf(
+        ResUtil.getColorAttr(activity, R.attr.colorCustomBlue)
+    ));
 
     // necessary because else getValue() doesn't give current value (?)
     viewModel.getFormData().getQuantityUnitsLive().observe(getViewLifecycleOwner(), qUs -> {

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/OverviewStartFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/OverviewStartFragment.java
@@ -189,9 +189,12 @@ public void onGlobalLayout() {
     // DEBUG LABEL
 
     if (BuildConfig.DEBUG) {
-      ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.yellow);
-      binding.imageLabelDebug.setColorFilter(roles.getOnAccent());
-      binding.imageLabelDebugBg.setColorFilter(roles.getAccent());
+      binding.imageLabelDebug.setColorFilter(
+          ResUtil.getColorAttr(activity, R.attr.colorOnCustomYellow)
+      );
+      binding.imageLabelDebugBg.setColorFilter(
+          ResUtil.getColorAttr(activity, R.attr.colorCustomYellow)
+      );
     }
 
     // UPDATE UI

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/PurchaseFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/PurchaseFragment.java
@@ -264,14 +264,14 @@ public void onViewCreated(@Nullable View view, @Nullable Bundle savedInstanceSta
             || viewModel.isProductWillBeFilled()) && viewModel.getFormData().isScannerVisible()
     );
 
-    ColorRoles roles = ResUtil.getHarmonizedRoles(activity, R.color.blue);
+    int colorBlue = ResUtil.getColorAttr(activity, R.attr.colorCustomBlue);
     viewModel.getQuickModeEnabled().observe(
         getViewLifecycleOwner(), value -> binding.toolbar.setTitleTextColor(
-            value ? roles.getAccent() : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
+            value ? colorBlue : ResUtil.getColorAttr(activity, R.attr.colorOnSurface)
         )
     );
-    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
-    binding.textInputPurchasePrice.setHelperTextColor(ColorStateList.valueOf(roles.getAccent()));
+    binding.textInputAmount.setHelperTextColor(ColorStateList.valueOf(colorBlue));
+    binding.textInputPurchasePrice.setHelperTextColor(ColorStateList.valueOf(colorBlue));
     viewModel.getFormData().getDueDateErrorLive().observe(
         getViewLifecycleOwner(), value -> binding.textDueDate.setTextColor(
             ResUtil.getColorAttr(activity, value ? R.attr.colorError : R.attr.colorOnSurfaceVariant)

diff --git a/app/src/main/java/xyz/zedler/patrick/grocy/fragment/RecipeFragment.java b/app/src/main/java/xyz/zedler/patrick/grocy/fragment/RecipeFragment.java
@@ -175,8 +175,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       activity.navUtil.navigateFragment(R.id.photoViewerFragment, argsPhotoViewer);
     });
 
-    ColorRoles colorYellow = ResUtil.getHarmonizedRoles(requireContext(), R.color.yellow);
-    binding.buttonFulfillmentInfo.setIconTint(ColorStateList.valueOf(colorYellow.getAccent()));
+    binding.buttonFulfillmentInfo.setIconTint(ColorStateList.valueOf(
+        ResUtil.getColorAttr(activity, R.attr.colorCustomYellow)
+    ));
 
     binding.recycler.setLayoutManager(
         new LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)