feat(theming): Use Material 3 theming attributes for icon coloring

Signed-off-by: Stefan Niedermann <info@niedermann.it>

2 files changed, 6 insertions, 6 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java
index a653feac8..131fca77d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java
@@ -59,7 +59,7 @@ public class ColorChooser extends LinearLayout {
             image.setLayoutParams(params);
             image.setOnClickListener((imageView) -> {
                 if (previouslySelectedImageView != null) { // null when first selection
-                    previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_grey600_36dp, previouslySelectedColor));
+                    previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_36dp, previouslySelectedColor));
                 }
                 image.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_alpha_check_36dp, color));
                 selectedColor = color;
@@ -69,7 +69,7 @@ public class ColorChooser extends LinearLayout {
                 binding.customColorPicker.setVisibility(View.GONE);
                 binding.brightnessSlide.setVisibility(View.GONE);
             });
-            image.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_grey600_36dp, color));
+            image.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_36dp, color));
             binding.colorPicker.addView(image, binding.colorPicker.getChildCount() - 1);
         }
 
@@ -78,14 +78,14 @@ public class ColorChooser extends LinearLayout {
             binding.customColorPicker.setVisibility(View.VISIBLE);
             binding.brightnessSlide.setVisibility(View.VISIBLE);
             if (previouslySelectedImageView != null) {
-                previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(context, R.drawable.circle_grey600_36dp, selectedColor));
+                previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(context, R.drawable.circle_36dp, selectedColor));
                 previouslySelectedImageView = null;
             }
         });
 
         binding.customColorPicker.setColorListener((ColorEnvelopeListener) (envelope, fromUser) -> {
             if (previouslySelectedImageView != null) {
-                previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_grey600_36dp, previouslySelectedColor));
+                previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_36dp, previouslySelectedColor));
                 previouslySelectedImageView = null;
             }
             @ColorInt
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java
index 4c52ffc1a..367e9c597 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java
@@ -70,8 +70,8 @@ public class OverlappingAvatars extends RelativeLayout {
             avatar.requestLayout();
             Glide.with(context)
                     .load(account.getAvatarUrl(avatarSize, assignedUsers.get(avatarCount).getUid()))
-                    .placeholder(R.drawable.ic_person_grey600_24dp)
-                    .error(R.drawable.ic_person_grey600_24dp)
+                    .placeholder(R.drawable.ic_person_24dp)
+                    .error(R.drawable.ic_person_24dp)
                     .apply(RequestOptions.circleCropTransform())
                     .into(avatar);
         }