From 1d18d0b078ae795692a58ec3c8abf0c430030be2 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Wed, 17 Jan 2024 10:59:53 +0100 Subject: chore(deps): Do no longer rely on android-commons lib to calculate dp to px Signed-off-by: Stefan Niedermann --- .../deck/ui/accountswitcher/AccountSwitcherDialog.java | 3 +-- .../deck/ui/accountswitcher/AccountSwitcherViewHolder.java | 3 +-- .../deck/ui/board/accesscontrol/AccessControlAdapter.java | 5 ++--- .../nextcloud/deck/ui/card/UserAutoCompleteAdapter.java | 3 +-- .../CardAttachmentsBottomsheetBehaviorCallback.java | 12 +++++------- .../deck/ui/card/attachments/CardAttachmentsFragment.java | 3 +-- .../deck/ui/card/comments/CardCommentsFragment.java | 3 +-- .../deck/ui/card/comments/CardCommentsMentionProposer.java | 5 ++--- .../deck/ui/card/comments/ItemCommentViewHolder.java | 3 +-- .../nextcloud/deck/ui/card/details/AssigneeViewHolder.java | 3 +-- .../nextcloud/deck/ui/card/details/CardDetailsFragment.java | 9 ++++----- .../nextcloud/deck/ui/filter/FilterUserAdapter.java | 3 +-- .../nextcloud/deck/ui/main/search/SearchCardViewHolder.java | 3 +-- .../deck/ui/manageaccounts/ManageAccountViewHolder.java | 3 +-- .../nextcloud/deck/ui/preparecreate/AccountAdapter.java | 3 +-- .../it/niedermann/nextcloud/deck/ui/view/ColorChooser.java | 3 +-- .../it/niedermann/nextcloud/deck/ui/view/DueDateChip.java | 3 +-- .../nextcloud/deck/ui/view/OverlappingAvatars.java | 11 ++++++----- .../nextcloud/deck/ui/view/labelchip/CompactLabelChip.java | 3 +-- .../nextcloud/deck/ui/view/labellayout/LabelLayout.java | 3 +-- .../deck/ui/widget/upcoming/UpcomingWidgetFactory.java | 7 ++++--- 21 files changed, 38 insertions(+), 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 index 7f976970a..2f9671ce5 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 @@ -24,7 +24,6 @@ import java.util.Objects; 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 class AccountSwitcherDialog extends DialogFragment { 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/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 6d635b9d6..f3c61c3ce 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 @@ -11,7 +11,6 @@ import androidx.recyclerview.widget.RecyclerView; 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 class AccountSwitcherViewHolder extends RecyclerView.ViewHolder { ); 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/board/accesscontrol/AccessControlAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java index bb6add7f4..0c813d04e 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 @@ -16,7 +16,6 @@ import java.util.LinkedList; 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 class AccessControlAdapter extends RecyclerView.Adapter { } 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/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java index 6b60bbffd..473937753 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java +++ b/app/src/main/java/it/niedermann/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.bottomnavigation.BottomNavigationView; 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 class CardAttachmentsBottomsheetBehaviorCallback extends BottomSheetBehav 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/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java index ea4e3c9a4..458f048be 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java @@ -61,7 +61,6 @@ import id.zelory.compressor.constraint.QualityConstraint; 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 class CardAttachmentsFragment extends Fragment implements AttachmentDelet 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 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 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 index 989b17ef7..8148ff783 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 @@ -8,7 +8,6 @@ import androidx.recyclerview.widget.RecyclerView; 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 class AssigneeViewHolder extends RecyclerView.ViewHolder { public void bind(@NonNull Account account, @NonNull User user, @Nullable Consumer 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 index 4401eaf08..d86f9361a 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 @@ -35,7 +35,6 @@ import java.util.stream.Stream; 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 class CardDetailsFragment extends Fragment implements CardDueDateView.Due 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 @@ public class CardDetailsFragment extends Fragment implements CardDueDateView.Due 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 index fec2186a1..1657efdff 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 @@ -15,7 +15,6 @@ import java.util.ArrayList; 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 @@ public class FilterUserAdapter extends RecyclerView.Adapter { } 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 index ae520cf91..a653feac8 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 @@ -18,7 +18,6 @@ import com.skydoves.colorpickerview.listeners.ColorEnvelopeListener; 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 class ColorChooser extends LinearLayout { 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 index 8a1d547e0..095a46bd3 100644 --- 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.Instant; 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 class DueDateChip extends Chip { 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); 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 c1d5af3a2..4c52ffc1a 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 @@ -16,7 +16,6 @@ import com.bumptech.glide.request.RequestOptions; import java.util.List; -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; @@ -41,10 +40,12 @@ public class OverlappingAvatars extends RelativeLayout { public OverlappingAvatars(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - maxAvatarCount = context.getResources().getInteger(R.integer.max_avatar_count); - avatarBorderSize = DimensionUtil.INSTANCE.dpToPx(context, R.dimen.avatar_size_small_overlapping_border); - avatarSize = DimensionUtil.INSTANCE.dpToPx(context, R.dimen.avatar_size_small) + avatarBorderSize * 2; - overlapPx = DimensionUtil.INSTANCE.dpToPx(context, R.dimen.avatar_size_small_overlapping); + + final var resources = getResources(); + maxAvatarCount = resources.getInteger(R.integer.max_avatar_count); + avatarBorderSize = resources.getDimensionPixelSize(R.dimen.avatar_size_small_overlapping_border); + avatarSize = resources.getDimensionPixelSize(R.dimen.avatar_size_small) + avatarBorderSize * 2; + overlapPx = resources.getDimensionPixelSize(R.dimen.avatar_size_small_overlapping); borderDrawable = ContextCompat.getDrawable(context, R.drawable.avatar_border); assert borderDrawable != null; DrawableCompat.setTint(borderDrawable, ContextCompat.getColor(context, R.color.bg_card)); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/CompactLabelChip.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/CompactLabelChip.java index a2a50430c..3516b036b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/CompactLabelChip.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/CompactLabelChip.java @@ -6,7 +6,6 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.Px; -import it.niedermann.android.util.DimensionUtil; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.model.Label; @@ -16,6 +15,6 @@ public class CompactLabelChip extends LabelChip { public CompactLabelChip(@NonNull Context context, @NonNull Label label, @Px int gutter) { super(context, label, gutter); params.setFlexBasisPercent(1 / 6.5f); - setHeight(DimensionUtil.INSTANCE.dpToPx(context, R.dimen.compact_label_height)); + setHeight(getResources().getDimensionPixelSize(R.dimen.compact_label_height)); } } \ No newline at end of file diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labellayout/LabelLayout.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labellayout/LabelLayout.java index 526bdbaef..ce7e38262 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labellayout/LabelLayout.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labellayout/LabelLayout.java @@ -11,7 +11,6 @@ import com.google.android.flexbox.FlexboxLayout; import java.util.LinkedList; import java.util.List; -import it.niedermann.android.util.DimensionUtil; import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.model.Label; @@ -26,7 +25,7 @@ public abstract class LabelLayout extends FlexboxLayout { public LabelLayout(Context context, AttributeSet attrs) { super(context, attrs); - this.gutter = DimensionUtil.INSTANCE.dpToPx(context, R.dimen.spacer_1hx); + this.gutter = context.getResources().getDimensionPixelSize(R.dimen.spacer_1hx); } /** diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java index d7c320a95..902d82d88 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.List; import java.util.NoSuchElementException; -import it.niedermann.android.util.DimensionUtil; import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.model.full.FullCard; @@ -35,8 +34,10 @@ public class UpcomingWidgetFactory implements RemoteViewsService.RemoteViewsFact this.context = context; this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); this.baseRepository = new BaseRepository(context); - this.headerHorizontalPadding = DimensionUtil.INSTANCE.dpToPx(context, R.dimen.spacer_1hx); - this.headerVerticalPaddingNth = DimensionUtil.INSTANCE.dpToPx(context, R.dimen.spacer_2x); + + final var resources = context.getResources(); + this.headerHorizontalPadding = resources.getDimensionPixelSize(R.dimen.spacer_1hx); + this.headerVerticalPaddingNth = resources.getDimensionPixelSize(R.dimen.spacer_2x); } @Override -- cgit v1.2.3