diff options
author | Stefan Niedermann <info@niedermann.it> | 2024-01-19 23:32:31 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2024-01-19 23:32:31 +0300 |
commit | 01b4549095a30d5724c09b3d9dc320b71fb24eb4 (patch) | |
tree | 61bf6be8fbc6541db587307faca6823683e191a5 /app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments | |
parent | 7c8bc684aff61af654cb871b2778ac3d8622d95c (diff) | |
parent | 1d18d0b078ae795692a58ec3c8abf0c430030be2 (diff) |
Merge branch 'mark-card-as-done-and-remove-dp-to-px' into mark-card-as-done
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments')
3 files changed, 4 insertions, 7 deletions
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 4704ea45a..495aabd50 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 @@ -24,7 +24,6 @@ import com.bumptech.glide.request.RequestOptions; import java.time.Instant; -import it.niedermann.android.util.DimensionUtil; import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabCommentsBinding; @@ -94,7 +93,7 @@ public class CardCommentsFragment extends Fragment implements Themed, CommentEdi binding.comments.setAdapter(adapter); binding.replyCommentCancelButton.setOnClickListener((v) -> commentsViewModel.setReplyToComment(null)); Glide.with(binding.avatar.getContext()) - .load(editCardViewModel.getAccount().getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.avatar.getContext(), R.dimen.icon_size_details))) + .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) 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 403e26886..fe10f6cfa 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 @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; import it.niedermann.android.reactivelivedata.ReactiveLiveData; -import it.niedermann.android.util.DimensionUtil; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.User; @@ -56,9 +55,9 @@ public class CardCommentsMentionProposer implements TextWatcher { this.mentionProposerWrapper = mentionProposerWrapper; this.mentionProposer = avatarProposer; baseRepository = new BaseRepository(editText.getContext()); - avatarSize = DimensionUtil.INSTANCE.dpToPx(mentionProposer.getContext(), R.dimen.avatar_size_small); + avatarSize = mentionProposer.getResources().getDimensionPixelSize(R.dimen.avatar_size_small); layoutParams = new LinearLayout.LayoutParams(avatarSize, avatarSize); - layoutParams.setMarginEnd(DimensionUtil.INSTANCE.dpToPx(mentionProposer.getContext(), R.dimen.spacer_1x)); + layoutParams.setMarginEnd(mentionProposer.getResources().getDimensionPixelSize(R.dimen.spacer_1x)); } @Override 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 e2bf7a84b..7a4df435f 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 @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.function.Consumer; import it.niedermann.android.util.ClipboardUtil; -import it.niedermann.android.util.DimensionUtil; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.ItemCommentBinding; import it.niedermann.nextcloud.deck.model.Account; @@ -43,7 +42,7 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder { public void bind(@NonNull FullDeckComment comment, @NonNull Account account, @Nullable ThemeUtils utils, @NonNull MenuInflater inflater, @NonNull CommentDeletedListener deletedListener, @NonNull CommentSelectAsReplyListener selectAsReplyListener, @NonNull FragmentManager fragmentManager, @NonNull Consumer<CharSequence> editListener) { Glide.with(binding.avatar.getContext()) - .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.avatar.getContext(), R.dimen.avatar_size), comment.getComment().getActorId())) + .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) |