chore(done): Use filled checkbox item for tasks

Signed-off-by: Stefan Niedermann <info@niedermann.it>

6 files changed, 27 insertions, 7 deletions

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 7653f4ff3..193fc7a2c 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
@@ -58,6 +58,8 @@ public abstract class AbstractCardViewHolder extends RecyclerView.ViewHolder {
 
         if (utils != null) {
             utils.platform.colorImageView(getNotSyncedYet(), ColorRole.PRIMARY);
+            utils.platform.colorImageView(getCardMenu(), ColorRole.ON_SURFACE);
+            utils.platform.colorTextView(getCardTitle(), ColorRole.ON_SURFACE);
         }
         // TODO should be discussed with UX
         // utils.material.themeCardView(getCard());
@@ -95,7 +97,7 @@ public abstract class AbstractCardViewHolder extends RecyclerView.ViewHolder {
 
     protected abstract TextView getCardTitle();
 
-    protected abstract View getCardMenu();
+    protected abstract ImageView getCardMenu();
 
     protected abstract MaterialCardView getCard();
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CompactCardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CompactCardViewHolder.java
index 7c53451a5..8dc4a3e48 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CompactCardViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CompactCardViewHolder.java
@@ -79,7 +79,7 @@ public class CompactCardViewHolder extends AbstractCardViewHolder {
     }
 
     @Override
-    protected View getCardMenu() {
+    protected ImageView getCardMenu() {
         return binding.cardMenu;
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardOnlyTitleViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardOnlyTitleViewHolder.java
index 1b6b2b3a0..4e16f8127 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardOnlyTitleViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardOnlyTitleViewHolder.java
@@ -1,6 +1,5 @@
 package it.niedermann.nextcloud.deck.ui.card;
 
-import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.ImageView;
@@ -51,7 +50,7 @@ public class DefaultCardOnlyTitleViewHolder extends AbstractCardViewHolder {
     }
 
     @Override
-    protected View getCardMenu() {
+    protected ImageView getCardMenu() {
         return binding.cardMenu;
     }
 
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;
     }
 
diff --git a/app/src/main/res/drawable/ic_check_box_24.xml b/app/src/main/res/drawable/ic_check_box_24.xml
new file mode 100644
index 000000000..0c3970b1a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_box_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#757575" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_card_default.xml b/app/src/main/res/layout/item_card_default.xml
index a46582418..3dfcff46e 100644
--- a/app/src/main/res/layout/item_card_default.xml
+++ b/app/src/main/res/layout/item_card_default.xml
@@ -99,9 +99,10 @@
                     android:id="@+id/card_count_tasks"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/spacer_1qx"
                     android:gravity="center_vertical"
                     android:padding="@dimen/spacer_1hx"
-                    tools:drawableStartCompat="@drawable/ic_check_grey600_24dp"
+                    tools:drawableStartCompat="@drawable/ic_check_box_24"
                     tools:text="1/2" />
 
                 <com.google.android.material.textview.MaterialTextView