From 8471bf3b4dea916ed87f70c6b497bb18336723e3 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Sun, 14 Jan 2024 11:18:03 +0100 Subject: feat(done): Enhance due date / done UX in board view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use ✔️ icon when done is present in favor of 📆 / 🕙 in board view - Change icon from 📆 to 🕙 for due dates - Move temporal information into own reusable component to encapsulate logic Refs: #1556 Signed-off-by: Stefan Niedermann --- .../it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java') 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 dc6e5a956..083480736 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 @@ -19,6 +19,7 @@ import it.niedermann.nextcloud.deck.databinding.ItemCardDefaultBinding; import it.niedermann.nextcloud.deck.model.Account; import it.niedermann.nextcloud.deck.model.full.FullCard; import it.niedermann.nextcloud.deck.ui.theme.ThemeUtils; +import it.niedermann.nextcloud.deck.ui.view.DueDateChip; public class DefaultCardViewHolder extends AbstractCardViewHolder { private final ItemCardDefaultBinding binding; @@ -93,7 +94,7 @@ public class DefaultCardViewHolder extends AbstractCardViewHolder { } @Override - protected TextView getCardDueDate() { + protected DueDateChip getCardDueDate() { return binding.cardDueDate; } -- cgit v1.2.3 From 47145c1c06b2de007dc67b0182235915500d4bb9 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Tue, 16 Jan 2024 09:21:57 +0100 Subject: chore(done): Use filled checkbox item for tasks Signed-off-by: Stefan Niedermann --- .../nextcloud/deck/ui/card/DefaultCardViewHolder.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java') 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 083480736..20ce6dd1d 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 @@ -13,6 +13,9 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import com.google.android.material.card.MaterialCardView; +import com.nextcloud.android.common.ui.theme.utils.ColorRole; + +import java.util.stream.Stream; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.ItemCardDefaultBinding; @@ -79,7 +82,7 @@ public class DefaultCardViewHolder extends AbstractCardViewHolder { final var taskStatus = fullCard.getCard().getTaskStatus(); if (taskStatus.taskCount > 0) { binding.cardCountTasks.setText(context.getResources().getString(R.string.task_count, String.valueOf(taskStatus.doneCount), String.valueOf(taskStatus.taskCount))); - binding.cardCountTasks.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(context, R.drawable.ic_check_grey600_24dp), null, null, null); + binding.cardCountTasks.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(context, R.drawable.ic_check_box_24), null, null, null); binding.cardCountTasks.setVisibility(View.VISIBLE); } else { final String description = fullCard.getCard().getDescription(); @@ -91,6 +94,16 @@ public class DefaultCardViewHolder extends AbstractCardViewHolder { binding.cardCountTasks.setVisibility(View.GONE); } } + + if (utils != null) { + Stream.of( + binding.cardCountAttachments, + binding.cardCountTasks, + binding.cardCountComments + ).forEach(v -> { + utils.platform.colorTextView(v, ColorRole.ON_SURFACE_VARIANT ); + }); + } } @Override @@ -109,7 +122,7 @@ public class DefaultCardViewHolder extends AbstractCardViewHolder { } @Override - protected View getCardMenu() { + protected ImageView getCardMenu() { return binding.cardMenu; } -- cgit v1.2.3