Merge branch 'mark-card-as-done-and-remove-dp-to-px' into mark-card-a…

…s-done
stefan-niedermann · Jan 19, 2024 · 01b4549 · 01b4549
2 parents 7c8bc68 + 1d18d0b
commit 01b4549
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 56 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
@@ -24,7 +24,6 @@
 import java.util.stream.Collectors;
 
 import it.niedermann.android.reactivelivedata.ReactiveLiveData;
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.DialogAccountSwitcherBinding;
 import it.niedermann.nextcloud.deck.ui.ImportAccountActivity;
@@ -76,7 +75,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                     binding.accountHost.setText(Uri.parse(currentAccount.getUrl()).getHost());
 
                     Glide.with(requireContext())
-                            .load(currentAccount.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.currentAccountItemAvatar.getContext(), R.dimen.avatar_size)))
+                            .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)

diff --git a/.../main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java b/.../main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java
@@ -11,7 +11,6 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemAccountChooseBinding;
 import it.niedermann.nextcloud.deck.model.Account;
@@ -34,7 +33,7 @@ public void bind(@NonNull Account account, @NonNull Consumer<Account> onAccountC
         );
         binding.accountHost.setText(Uri.parse(account.getUrl()).getHost());
         Glide.with(itemView.getContext())
-                .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.accountItemAvatar.getContext(), R.dimen.avatar_size)))
+                .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)

diff --git a/...c/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java b/...c/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java
@@ -16,7 +16,6 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemAccessControlBinding;
 import it.niedermann.nextcloud.deck.databinding.ItemAccessControlOwnerBinding;
@@ -82,7 +81,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                 final var ownerHolder = (OwnerViewHolder) holder;
                 ownerHolder.binding.owner.setText(ac.getUser().getDisplayname());
                 Glide.with(ownerHolder.binding.avatar.getContext())
-                        .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(ownerHolder.binding.avatar.getContext(), R.dimen.avatar_size), ac.getUser().getUid()))
+                        .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)
@@ -93,7 +92,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             default: {
                 final var acHolder = (AccessControlViewHolder) holder;
                 Glide.with(acHolder.binding.avatar.getContext())
-                        .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(acHolder.binding.avatar.getContext(), R.dimen.avatar_size), ac.getUser().getUid()))
+                        .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)

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
@@ -15,7 +15,6 @@
 import java.util.List;
 
 import it.niedermann.android.reactivelivedata.ReactiveLiveData;
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemAutocompleteUserBinding;
@@ -82,7 +81,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         }
 
         Glide.with(binding.icon.getContext())
-                .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.icon.getContext(), R.dimen.avatar_size), getItem(position).getUid()))
+                .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)

diff --git a/...ermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java b/...ermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java
@@ -1,5 +1,9 @@
 package it.niedermann.nextcloud.deck.ui.card.attachments;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN;
+
 import android.content.Context;
 import android.view.View;
 
@@ -16,12 +20,6 @@
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
-import it.niedermann.android.util.DimensionUtil;
-
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN;
-
 public class CardAttachmentsBottomsheetBehaviorCallback extends BottomSheetBehavior.BottomSheetCallback {
     @NonNull
     private final OnBackPressedCallback backPressedCallback;
@@ -55,7 +53,7 @@ public CardAttachmentsBottomsheetBehaviorCallback(@NonNull Context context,
         this.bottomNavigation = bottomNavigation;
         this.backdropColorExpanded = ContextCompat.getColor(context, backdropColorExpanded);
         this.backdropColorCollapsed = ContextCompat.getColor(context, backdropColorCollapsed);
-        this.bottomNavigationHeight = DimensionUtil.INSTANCE.dpToPx(context, bottomNavigationHeight);
+        this.bottomNavigationHeight = context.getResources().getDimensionPixelSize(bottomNavigationHeight);
     }
 
     @Override

diff --git a/...c/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/...c/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
@@ -61,7 +61,6 @@
 import id.zelory.compressor.constraint.ResolutionConstraint;
 import id.zelory.compressor.constraint.SizeConstraint;
 import it.niedermann.android.reactivelivedata.ReactiveLiveData;
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabAttachmentsBinding;
@@ -155,7 +154,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                 this.binding.attachmentsList.setVisibility(VISIBLE);
             }
         });
-        galleryItemDecoration = new GalleryItemDecoration(DimensionUtil.INSTANCE.dpToPx(requireContext(), R.dimen.spacer_1qx));
+        galleryItemDecoration = new GalleryItemDecoration(getResources().getDimensionPixelSize(R.dimen.spacer_1qx));
         mBottomSheetBehaviour = BottomSheetBehavior.from(binding.bottomSheetParent);
         mBottomSheetBehaviour.setDraggable(true);
         mBottomSheetBehaviour.setHideable(true);

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
@@ -24,7 +24,6 @@
 
 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 View onCreateView(@NonNull LayoutInflater inflater,
         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/.../main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java b/.../main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java
@@ -19,7 +19,6 @@
 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 CardCommentsMentionProposer(@NonNull LifecycleOwner owner, @NonNull Accou
         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
@@ -21,7 +21,6 @@
 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 ItemCommentViewHolder(ItemCommentBinding binding) {
 
     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)

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
@@ -8,7 +8,6 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemAssigneeBinding;
 import it.niedermann.nextcloud.deck.model.Account;
@@ -25,7 +24,7 @@ public AssigneeViewHolder(ItemAssigneeBinding binding) {
 
     public void bind(@NonNull Account account, @NonNull User user, @Nullable Consumer<User> onClickListener) {
         Glide.with(binding.avatar.getContext())
-                .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.avatar.getContext(), R.dimen.avatar_size), user.getUid()))
+                .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)

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
@@ -35,7 +35,6 @@
 
 import it.niedermann.android.markdown.MarkdownEditor;
 import it.niedermann.android.util.ColorUtil;
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabDetailsBinding;
@@ -90,9 +89,9 @@ public View onCreateView(@NonNull LayoutInflater inflater,
             return binding.getRoot();
         }
 
-        @Px final int avatarSize = DimensionUtil.INSTANCE.dpToPx(requireContext(), R.dimen.avatar_size);
+        @Px final int avatarSize = getResources().getDimensionPixelSize(R.dimen.avatar_size);
         final var avatarLayoutParams = new LinearLayout.LayoutParams(avatarSize, avatarSize);
-        avatarLayoutParams.setMargins(0, 0, DimensionUtil.INSTANCE.dpToPx(requireContext(), R.dimen.spacer_1x), 0);
+        avatarLayoutParams.setMargins(0, 0, getResources().getDimensionPixelSize(R.dimen.spacer_1x), 0);
 
         setupAssignees();
         setupLabels((Account) args.getSerializable(KEY_ACCOUNT));
@@ -296,8 +295,8 @@ private void setupAssignees() {
         adapter = new AssigneeAdapter((user) -> CardAssigneeDialog.newInstance(user).show(getChildFragmentManager(), CardAssigneeDialog.class.getSimpleName()), viewModel.getAccount());
         binding.assignees.setAdapter(adapter);
         binding.assignees.post(() -> {
-            @Px final int gutter = DimensionUtil.INSTANCE.dpToPx(requireContext(), R.dimen.spacer_1x);
-            final int spanCount = (int) (float) binding.labelsWrapper.getWidth() / (DimensionUtil.INSTANCE.dpToPx(requireContext(), R.dimen.avatar_size) + gutter);
+            @Px final int gutter = getResources().getDimensionPixelSize(R.dimen.spacer_1x);
+            final int spanCount = (int) (float) binding.labelsWrapper.getWidth() / (getResources().getDimensionPixelSize(R.dimen.avatar_size) + gutter);
             binding.assignees.setLayoutManager(new GridLayoutManager(getContext(), spanCount));
             binding.assignees.addItemDecoration(new AssigneeDecoration(spanCount, gutter));
         });

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
@@ -15,7 +15,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemFilterUserBinding;
 import it.niedermann.nextcloud.deck.model.Account;
@@ -89,7 +88,7 @@ class UserViewHolder extends RecyclerView.ViewHolder implements Themed {
         void bind(@NonNull final User user) {
             binding.title.setText(user.getDisplayname());
             Glide.with(binding.avatar.getContext())
-                    .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.avatar.getContext(), R.dimen.avatar_size), user.getUid()))
+                    .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)

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
@@ -18,7 +18,6 @@
 
 import java.util.List;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemSearchCardBinding;
 import it.niedermann.nextcloud.deck.model.Account;
@@ -64,7 +63,7 @@ public void bind(@NonNull Account account, long localBoardId, @NonNull FullCard
                     .load(new SingleSignOnUrl(account.getName(), AttachmentUtil.getThumbnailUrl(account, fullCard.getId(), coverImages.get(), binding.coverImages.getWidth())))
                     .apply(new RequestOptions().transform(
                             new CenterCrop(),
-                            new RoundedCorners(DimensionUtil.INSTANCE.dpToPx(context, R.dimen.spacer_1x))
+                            new RoundedCorners(context.getResources().getDimensionPixelSize(R.dimen.spacer_1x))
                     ))
                     .placeholder(R.drawable.ic_image_grey600_24dp)
                     .error(R.drawable.ic_image_grey600_24dp)

diff --git a/...src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java b/...src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java
@@ -15,7 +15,6 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemAccountChooseBinding;
 import it.niedermann.nextcloud.deck.model.Account;
@@ -38,7 +37,7 @@ public void bind(@NonNull Account account, @NonNull Consumer<Account> onAccountC
         );
         binding.accountHost.setText(Uri.parse(account.getUrl()).getHost());
         Glide.with(itemView.getContext())
-                .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.accountItemAvatar.getContext(), R.dimen.avatar_size)))
+                .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)

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
@@ -11,7 +11,6 @@
 
 import java.net.URL;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemPrepareCreateAccountBinding;
@@ -49,7 +48,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
             }
 
             Glide.with(getContext())
-                    .load(account.getAvatarUrl(DimensionUtil.INSTANCE.dpToPx(binding.avatar.getContext(), R.dimen.avatar_size)))
+                    .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)
                     .apply(RequestOptions.circleCropTransform())

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
@@ -18,7 +18,6 @@
 
 import java.util.Arrays;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.WidgetColorChooserBinding;
 import it.niedermann.nextcloud.deck.ui.theme.DeckViewThemeUtils;
@@ -45,7 +44,7 @@ public ColorChooser(Context context, @Nullable AttributeSet attrs) {
                 ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT
         );
-        params.setMargins(0, DimensionUtil.INSTANCE.dpToPx(context, R.dimen.spacer_1x), 0, 0);
+        params.setMargins(0, getResources().getDimensionPixelSize(R.dimen.spacer_1x), 0, 0);
         params.setFlexBasisPercent(.15f);
 
         final var styles = context.obtainStyledAttributes(attrs, R.styleable.ColorChooser, 0, 0);

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/DueDateChip.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/DueDateChip.java
@@ -21,7 +21,6 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 
-import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.util.DateUtil;
 
@@ -54,7 +53,7 @@ public DueDateChip(Context context, AttributeSet attrs, int defStyleAttr) {
         setEnsureMinTouchTargetSize(false);
         setClickable(false);
 
-        @Px final var padding = DimensionUtil.INSTANCE.dpToPx(getContext(), R.dimen.spacer_1x);
+        @Px final var padding = getResources().getDimensionPixelSize(R.dimen.spacer_1x);
         setPadding(padding, padding, padding, padding);
         setMinHeight(0);
         setChipMinHeight(0);