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

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

13 files changed, 27 insertions, 27 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AbstractCardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AbstractCardViewHolder.java
index 744f6f7b6..b2146796c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AbstractCardViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AbstractCardViewHolder.java
@@ -149,8 +149,8 @@ public abstract class AbstractCardViewHolder extends RecyclerView.ViewHolder {
                         coverImagesHolder.addView(coverImageView);
                         Glide.with(coverImageView)
                                 .load(new SingleSignOnUrl(account.getName(), AttachmentUtil.getThumbnailUrl(account, fullCard.getId(), coverImage, coverWidth, coverHeight)))
-                                .placeholder(R.drawable.ic_image_grey600_24dp)
-                                .error(R.drawable.ic_image_grey600_24dp)
+                                .placeholder(R.drawable.ic_image_24dp)
+                                .error(R.drawable.ic_image_24dp)
                                 .into(coverImageView);
                     }
                 });
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java
index 97144ad44..566b55512 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java
@@ -87,7 +87,7 @@ public class DefaultCardViewHolder extends AbstractCardViewHolder {
         } else {
             final String description = fullCard.getCard().getDescription();
             if (!TextUtils.isEmpty(description)) {
-                binding.cardCountTasks.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(context, R.drawable.ic_baseline_subject_24), null, null, null);
+                binding.cardCountTasks.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(context, R.drawable.ic_subject_24), null, null, null);
                 binding.cardCountTasks.setText(null);
                 binding.cardCountTasks.setVisibility(View.VISIBLE);
             } else {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
index 9140e305e..329c6b85f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
@@ -83,8 +83,8 @@ public class UserAutoCompleteAdapter extends AutoCompleteAdapter<User> {
         Glide.with(binding.icon.getContext())
                 .load(account.getAvatarUrl(binding.icon.getResources().getDimensionPixelSize(R.dimen.avatar_size), getItem(position).getUid()))
                 .apply(RequestOptions.circleCropTransform())
-                .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)
                 .into(binding.icon);
         binding.label.setText(getItem(position).getDisplayname());
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java
index b92dea1e4..1d3101d61 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java
@@ -44,9 +44,9 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder {
             case CHANGE -> imageView.setImageResource(R.drawable.type_change_36dp);
             case ADD -> imageView.setImageResource(R.drawable.type_add_color_36dp);
             case DELETE -> imageView.setImageResource(R.drawable.type_delete_color_36dp);
-            case ARCHIVE -> imageView.setImageResource(R.drawable.type_archive_grey600_36dp);
+            case ARCHIVE -> imageView.setImageResource(R.drawable.type_archive_36dp);
             case TAGGED_WITH_LABEL ->
-                    imageView.setImageResource(R.drawable.type_label_grey600_36dp);
+                    imageView.setImageResource(R.drawable.type_label_36dp);
             case COMMENT -> imageView.setImageResource(R.drawable.type_comment_36dp);
             case FILES -> imageView.setImageResource(R.drawable.type_file_36dp);
             case HISTORY -> imageView.setImageResource(R.drawable.type_history_36dp);
@@ -60,7 +60,7 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder {
                     DeckViewThemeUtils.setImageColor(context, imageView, R.color.activity_create);
             case DELETE ->
                     DeckViewThemeUtils.setImageColor(context, imageView, R.color.activity_delete);
-            default -> DeckViewThemeUtils.setImageColor(context, imageView, R.color.grey600);
+            default -> DeckViewThemeUtils.setImageColor(context, imageView, R.color.surfaceVariant);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
index 2709e056e..c46ee562d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
@@ -91,7 +91,7 @@ public class CardAssigneeDialog extends DialogFragment {
         binding.avatar.post(() -> Glide.with(binding.avatar.getContext())
                 .load(viewModel.getAccount().getAvatarUrl(binding.avatar.getWidth(), user.getUid()))
                 .placeholder(circularProgressDrawable)
-                .error(R.drawable.ic_person_grey600_24dp)
+                .error(R.drawable.ic_person_24dp)
                 .into(binding.avatar));
         binding.title.setText(user.getDisplayname());
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java
index 72d942618..fa61859d3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java
@@ -43,8 +43,8 @@ public class ImageAttachmentViewHolder extends AttachmentViewHolder {
             @Nullable final String uri = AttachmentUtil.getThumbnailUrl(account, cardRemoteId, attachment, getPreview().getWidth());
             Glide.with(getPreview().getContext())
                     .load(uri)
-                    .placeholder(R.drawable.ic_image_grey600_24dp)
-                    .error(R.drawable.ic_image_grey600_24dp)
+                    .placeholder(R.drawable.ic_image_24dp)
+                    .error(R.drawable.ic_image_24dp)
                     .into(getPreview());
         });
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactItemViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactItemViewHolder.java
index 7630d2d9e..5bdcb1814 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactItemViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactItemViewHolder.java
@@ -52,8 +52,8 @@ public class ContactItemViewHolder extends RecyclerView.ViewHolder {
             Glide.with(itemView.getContext())
                     .load(image)
                     .apply(RequestOptions.circleCropTransform())
-                    .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)
                     .into(binding.avatar);
         }
     }
@@ -61,7 +61,7 @@ public class ContactItemViewHolder extends RecyclerView.ViewHolder {
     public void bindError() {
         itemView.setOnClickListener(null);
         Glide.with(itemView.getContext())
-                .load(R.drawable.ic_person_grey600_24dp)
+                .load(R.drawable.ic_person_24dp)
                 .into(binding.avatar);
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryItemViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryItemViewHolder.java
index 402329767..b416c7b6d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryItemViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryItemViewHolder.java
@@ -29,15 +29,15 @@ public class GalleryItemViewHolder extends RecyclerView.ViewHolder {
         itemView.setOnClickListener((v) -> onSelect.accept(uri, new Pair<>(null, Glide.with(itemView.getContext()).load(image))));
         Glide.with(itemView.getContext())
                 .load(image)
-                .placeholder(R.drawable.ic_image_grey600_24dp)
-                .error(R.drawable.ic_image_grey600_24dp)
+                .placeholder(R.drawable.ic_image_24dp)
+                .error(R.drawable.ic_image_24dp)
                 .into(binding.preview);
     }
 
     public void bindError() {
         itemView.setOnClickListener(null);
         Glide.with(itemView.getContext())
-                .load(R.drawable.ic_image_grey600_24dp)
+                .load(R.drawable.ic_image_24dp)
                 .into(binding.preview);
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
index 453fc61ad..70eec95d7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
@@ -98,8 +98,8 @@ public class CardCommentsFragment extends Fragment implements Themed, CommentEdi
         Glide.with(binding.avatar.getContext())
                 .load(editCardViewModel.getAccount().getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.icon_size_details)))
                 .apply(RequestOptions.circleCropTransform())
-                .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)
                 .into(binding.avatar);
 
         commentsViewModel.getReplyToComment().observe(getViewLifecycleOwner(), (comment) -> {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java
index fe10f6cfa..b8d8286f5 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java
@@ -92,8 +92,8 @@ public class CardCommentsMentionProposer implements TextWatcher {
                                         Glide.with(avatar.getContext())
                                                 .load(account.getAvatarUrl(avatarSize, user.getUid()))
                                                 .apply(RequestOptions.circleCropTransform())
-                                                .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)
                                                 .into(avatar);
                                     }
                                 } else {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
index 8dca7d0ac..f8d805c92 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java
@@ -44,8 +44,8 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder {
         Glide.with(binding.avatar.getContext())
                 .load(account.getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), comment.getComment().getActorId()))
                 .apply(RequestOptions.circleCropTransform())
-                .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)
                 .into(binding.avatar);
 
         final var mentions = new HashMap<String, String>(comment.getComment().getMentions().size());
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/AssigneeViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/AssigneeViewHolder.java
index 8148ff783..a7420ec69 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/AssigneeViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/AssigneeViewHolder.java
@@ -26,8 +26,8 @@ public class AssigneeViewHolder extends RecyclerView.ViewHolder {
         Glide.with(binding.avatar.getContext())
                 .load(account.getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), user.getUid()))
                 .apply(RequestOptions.circleCropTransform())
-                .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)
                 .into(binding.avatar);
         if (onClickListener != null) {
             itemView.setOnClickListener((v) -> onClickListener.accept(user));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
index 2c030f65d..e2f43d696 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
@@ -152,7 +152,7 @@ public class CardDetailsFragment extends Fragment implements CardDueDateView.Due
                     binding.descriptionToggle.setImageResource(R.drawable.ic_edit_24dp);
                 } else {
                     toggleEditorView(binding.descriptionEditorWrapper, binding.descriptionViewer, binding.descriptionEditor);
-                    binding.descriptionToggle.setImageResource(R.drawable.ic_baseline_eye_24);
+                    binding.descriptionToggle.setImageResource(R.drawable.ic_eye_24);
                 }
             });
             binding.descriptionToggle.setOnClickListener((v) -> viewModel.toggleDescriptionPreviewMode());
@@ -267,7 +267,7 @@ public class CardDetailsFragment extends Fragment implements CardDueDateView.Due
         final var chip = new Chip(requireContext());
         chip.setText(label.getTitle());
         if (viewModel.canEdit()) {
-            chip.setCloseIcon(ContextCompat.getDrawable(requireContext(), R.drawable.ic_close_circle_grey600));
+            chip.setCloseIcon(ContextCompat.getDrawable(requireContext(), R.drawable.ic_close_circle));
             chip.setCloseIconVisible(true);
             chip.setOnCloseIconClickListener(v -> {
                 binding.labelsGroup.removeView(chip);