diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui')
31 files changed, 69 insertions, 69 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java index 2f9671ce5..eba776cd7 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java @@ -77,8 +77,8 @@ public class AccountSwitcherDialog extends DialogFragment { Glide.with(requireContext()) .load(currentAccount.getAvatarUrl(binding.currentAccountItemAvatar.getResources().getDimensionPixelSize(R.dimen.avatar_size))) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .into(binding.currentAccountItemAvatar); applyTheme(currentAccount.getColor()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java index f3c61c3ce..bd91d4ec8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java @@ -35,8 +35,8 @@ public class AccountSwitcherViewHolder extends RecyclerView.ViewHolder { Glide.with(itemView.getContext()) .load(account.getAvatarUrl(binding.accountItemAvatar.getResources().getDimensionPixelSize(R.dimen.avatar_size))) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .into(binding.accountItemAvatar); itemView.setOnClickListener((v) -> onAccountClick.accept(account)); binding.delete.setVisibility(View.GONE); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardViewHolder.java index 2f1dbb06b..7d774fed8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardViewHolder.java @@ -72,7 +72,7 @@ public class ArchivedBoardViewHolder extends RecyclerView.ViewHolder { }); } else if (board.isPermissionShare()) { binding.boardMenu.setVisibility(View.VISIBLE); - binding.boardMenu.setImageDrawable(util.platform.tintDrawable(context, R.drawable.ic_share_grey600_18dp, ColorRole.ON_SURFACE_VARIANT)); + binding.boardMenu.setImageDrawable(util.platform.tintDrawable(context, R.drawable.ic_share_18dp, ColorRole.ON_SURFACE_VARIANT)); binding.boardMenu.setOnClickListener((v) -> AccessControlDialogFragment.newInstance(account, board.getLocalId()).show(fragmentManager, AccessControlDialogFragment.class.getSimpleName())); } binding.boardMenu.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java index bfc21b787..88cc5113f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java @@ -37,7 +37,7 @@ public class AttachmentViewHolder extends RecyclerView.ViewHolder { public void bind(@NonNull Account account, @NonNull Attachment attachment, long cardRemoteId) { if (MimeTypeUtil.isImage(attachment.getMimetype())) { binding.preview.setTransitionName(parentContext.getString(R.string.transition_attachment_preview, String.valueOf(attachment.getLocalId()))); - binding.preview.setImageResource(R.drawable.ic_image_grey600_24dp); + binding.preview.setImageResource(R.drawable.ic_image_24dp); binding.preview.post(() -> { final String uri = AttachmentUtil.getThumbnailUrl(account, cardRemoteId, attachment, binding.preview.getWidth(), binding.preview.getHeight()); Glide.with(parentContext) @@ -61,7 +61,7 @@ public class AttachmentViewHolder extends RecyclerView.ViewHolder { return false; } }) - .error(R.drawable.ic_image_grey600_24dp) + .error(R.drawable.ic_image_24dp) .into(binding.preview); }); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java index 0c813d04e..01c5b06e9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java @@ -83,8 +83,8 @@ public class AccessControlAdapter extends RecyclerView.Adapter<RecyclerView.View Glide.with(ownerHolder.binding.avatar.getContext()) .load(account.getAvatarUrl(ownerHolder.binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), ac.getUser().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(ownerHolder.binding.avatar); break; } @@ -94,13 +94,13 @@ public class AccessControlAdapter extends RecyclerView.Adapter<RecyclerView.View Glide.with(acHolder.binding.avatar.getContext()) .load(account.getAvatarUrl(acHolder.binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), ac.getUser().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(acHolder.binding.avatar); acHolder.binding.username.setText(ac.getUser().getDisplayname()); acHolder.binding.username.setCompoundDrawables(null, null, ac.getStatus() == DBStatus.LOCAL_EDITED.getId() - ? ContextCompat.getDrawable(context, R.drawable.ic_sync_blue_24dp) : null, null); + ? ContextCompat.getDrawable(context, R.drawable.ic_sync_18dp) : null, null); acHolder.binding.delete.setOnClickListener((v) -> accessControlChangedListener.deleteAccessControl(ac)); if (hasManagePermission) { 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); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java index d3b39caff..bb4e27473 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java @@ -44,7 +44,7 @@ public class FilterDialogFragment extends ThemedDialogFragment { final var context = requireContext(); - indicator = ContextCompat.getDrawable(context, R.drawable.circle_grey600_8dp); + indicator = ContextCompat.getDrawable(context, R.drawable.circle_8dp); filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java index 24d1819e5..bb17d6e83 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java @@ -96,7 +96,7 @@ public class FilterLabelsAdapter extends RecyclerView.Adapter<FilterLabelsAdapte public void bindNotAssigned() { binding.label.setText(itemView.getContext().getString(R.string.no_assigned_label)); binding.label.setTextColor(ColorStateList.valueOf(ContextCompat.getColor(itemView.getContext(), R.color.onSurface))); - binding.label.setChipIcon(ContextCompat.getDrawable(itemView.getContext(), R.drawable.ic_baseline_block_24)); + binding.label.setChipIcon(ContextCompat.getDrawable(itemView.getContext(), R.drawable.ic_block_24)); binding.label.setChipBackgroundColor(ColorStateList.valueOf(ContextCompat.getColor(itemView.getContext(), R.color.surface))); binding.label.setRippleColor(null); itemView.setSelected(selectedLabels.contains(NOT_ASSIGNED)); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserAdapter.java index 1657efdff..cdd22b961 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserAdapter.java @@ -90,8 +90,8 @@ public class FilterUserAdapter extends RecyclerView.Adapter<FilterUserAdapter.Us 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); itemView.setSelected(selectedUsers.contains(user)); applyTheme(color); @@ -101,7 +101,7 @@ public class FilterUserAdapter extends RecyclerView.Adapter<FilterUserAdapter.Us public void bindNotAssigned() { binding.title.setText(itemView.getContext().getString(R.string.simple_unassigned)); Glide.with(itemView.getContext()) - .load(R.drawable.ic_baseline_block_24) + .load(R.drawable.ic_block_24) .into(binding.avatar); itemView.setSelected(selectedUsers.contains(NOT_ASSIGNED)); applyTheme(color); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/DrawerMenuInflater.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/DrawerMenuInflater.java index dfc9f0ba8..70a3d1531 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/DrawerMenuInflater.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/DrawerMenuInflater.java @@ -49,7 +49,7 @@ public class DrawerMenuInflater<T extends FragmentActivity & ArchiveBoardListene final var navigationMap = new HashMap<Integer, Long>(); menu.clear(); - menu.add(Menu.NONE, MENU_ID_UPCOMING_CARDS, Menu.NONE, R.string.widget_upcoming_title).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.calendar_blank_grey600_24dp)); + menu.add(Menu.NONE, MENU_ID_UPCOMING_CARDS, Menu.NONE, R.string.widget_upcoming_title).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.calendar_blank_24dp)); int index = 0; for (final var fullBoard : fullBoards) { @@ -99,7 +99,7 @@ public class DrawerMenuInflater<T extends FragmentActivity & ArchiveBoardListene } else if (fullBoard.getBoard().isPermissionShare()) { final var contextMenu = new AppCompatImageButton(activity); contextMenu.setBackgroundDrawable(null); - contextMenu.setImageDrawable(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_share_grey600_18dp)); + contextMenu.setImageDrawable(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_share_18dp)); contextMenu.setOnClickListener((v) -> AccessControlDialogFragment.newInstance(account, fullBoard.getLocalId()).show(activity.getSupportFragmentManager(), AccessControlDialogFragment.class.getSimpleName())); menuItem.setActionView(contextMenu); } @@ -115,7 +115,7 @@ public class DrawerMenuInflater<T extends FragmentActivity & ArchiveBoardListene } menu.add(Menu.NONE, MENU_ID_SETTINGS, Menu.NONE, R.string.simple_settings).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_settings_24dp)); - menu.add(Menu.NONE, MENU_ID_ABOUT, Menu.NONE, R.string.about).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_info_outline_grey600_24dp)); + menu.add(Menu.NONE, MENU_ID_ABOUT, Menu.NONE, R.string.about).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_info_outline_24dp)); return navigationMap; } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java index 4388d0ae3..b5ee17f33 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java @@ -326,8 +326,8 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen .with(binding.toolbar.getContext()) .load(account.getAvatarUrl(binding.toolbar.getMenu().findItem(R.id.avatar).getIcon().getIntrinsicWidth())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .into(new CustomTarget<Drawable>() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/search/SearchCardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/search/SearchCardViewHolder.java index f7dea2385..8ca2a9841 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/search/SearchCardViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/search/SearchCardViewHolder.java @@ -65,8 +65,8 @@ public class SearchCardViewHolder extends SearchViewHolder { new CenterCrop(), new RoundedCorners(context.getResources().getDimensionPixelSize(R.dimen.spacer_1x)) )) - .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.coverImages)); } else { binding.coverImages.setVisibility(View.GONE); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java index 10249fc5b..a6495817a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java @@ -39,8 +39,8 @@ public class ManageAccountViewHolder extends RecyclerView.ViewHolder { Glide.with(itemView.getContext()) .load(account.getAvatarUrl(binding.accountItemAvatar.getResources().getDimensionPixelSize(R.dimen.avatar_size))) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .into(binding.accountItemAvatar); binding.currentAccountIndicator.setSelected(isCurrentAccount); itemView.setOnClickListener((v) -> onAccountClick.accept(account)); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java index 279540b72..dea4c07c0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java @@ -49,8 +49,8 @@ public class AccountAdapter extends AbstractAdapter<Account> { Glide.with(getContext()) .load(account.getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size))) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .apply(RequestOptions.circleCropTransform()) .into(binding.avatar); } else { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java index ff12de766..a6375c9f8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java @@ -19,7 +19,7 @@ public class TakePhotoViewModel extends BaseViewModel { @NonNull private CameraSelector cameraSelector = DEFAULT_BACK_CAMERA; @NonNull - private final MutableLiveData<Integer> cameraSelectorToggleButtonImageResource = new MutableLiveData<>(R.drawable.ic_baseline_camera_front_24); + private final MutableLiveData<Integer> cameraSelectorToggleButtonImageResource = new MutableLiveData<>(R.drawable.ic_camera_front_24); @NonNull private final MutableLiveData<Boolean> torchEnabled = new MutableLiveData<>(false); @@ -51,10 +51,10 @@ public class TakePhotoViewModel extends BaseViewModel { public void toggleCameraSelector() { if (this.cameraSelector == DEFAULT_BACK_CAMERA) { this.cameraSelector = DEFAULT_FRONT_CAMERA; - this.cameraSelectorToggleButtonImageResource.postValue(R.drawable.ic_baseline_camera_rear_24); + this.cameraSelectorToggleButtonImageResource.postValue(R.drawable.ic_camera_rear_24); } else { this.cameraSelector = DEFAULT_BACK_CAMERA; - this.cameraSelectorToggleButtonImageResource.postValue(R.drawable.ic_baseline_camera_front_24); + this.cameraSelectorToggleButtonImageResource.postValue(R.drawable.ic_camera_front_24); } } @@ -70,7 +70,7 @@ public class TakePhotoViewModel extends BaseViewModel { public LiveData<Integer> getTorchToggleButtonImageResource() { return new ReactiveLiveData<>(isTorchEnabled()) .map(enabled -> enabled - ? R.drawable.ic_baseline_flash_off_24 - : R.drawable.ic_baseline_flash_on_24); + ? R.drawable.ic_flash_off_24 + : R.drawable.ic_flash_on_24); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeckViewThemeUtils.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeckViewThemeUtils.java index d2dff1ae4..3b0b523ea 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeckViewThemeUtils.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeckViewThemeUtils.java @@ -134,7 +134,7 @@ public class DeckViewThemeUtils extends ViewThemeUtilsBase { */ @Nullable public Drawable getColoredBoardDrawable(@NonNull Context context, @ColorInt int boardColor) { - final var drawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.circle_grey600_36dp, null); + final var drawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.circle_36dp, null); return drawable == null ? null : platform.colorDrawable(drawable, boardColor); } 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); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java index 3d6dc0bbc..86324c6d1 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java @@ -106,7 +106,7 @@ public class SingleCardWidget extends AppWidgetProvider { } else { views.setViewVisibility(R.id.card_count_comments, View.VISIBLE); views.setViewVisibility(R.id.card_count_comments_image, View.VISIBLE); - views.setImageViewResource(R.id.card_count_comments_image, R.drawable.ic_comment_white_24dp); + views.setImageViewResource(R.id.card_count_comments_image, R.drawable.ic_comment_24dp); setupCounter(views, R.id.card_count_comments, commentsCount, counterMaxValue); } @@ -115,7 +115,7 @@ public class SingleCardWidget extends AppWidgetProvider { views.setViewVisibility(R.id.card_count_tasks, View.VISIBLE); views.setViewVisibility(R.id.card_count_tasks_image, View.VISIBLE); views.setTextViewText(R.id.card_count_tasks, context.getResources().getString(R.string.task_count, String.valueOf(taskStatus.doneCount), String.valueOf(taskStatus.taskCount))); - views.setImageViewResource(R.id.card_count_tasks_image, R.drawable.ic_check_grey600_24dp); + views.setImageViewResource(R.id.card_count_tasks_image, R.drawable.ic_check_24dp); } else { views.setViewVisibility(R.id.card_count_tasks, View.GONE); views.setViewVisibility(R.id.card_count_tasks_image, View.GONE); |