diff options
author | Stefan Niedermann <info@niedermann.it> | 2024-01-14 13:18:03 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2024-01-14 13:18:03 +0300 |
commit | 8471bf3b4dea916ed87f70c6b497bb18336723e3 (patch) | |
tree | 032d730d37f4a1a044a760a5dae41a660afecc25 /app/src/main/res | |
parent | 8ab9514b4a129d7d0db55811e785be367c86a176 (diff) |
feat(done): Enhance due date / done UX in board view
- 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 <info@niedermann.it>
Diffstat (limited to 'app/src/main/res')
8 files changed, 17 insertions, 39 deletions
diff --git a/app/src/main/res/drawable/due_done_background.xml b/app/src/main/res/drawable/due_done_background.xml deleted file mode 100644 index cdc93a0b9..000000000 --- a/app/src/main/res/drawable/due_done_background.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/due_done" /> - - <corners - android:radius="4dp" /> -</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/due_overdue_background.xml b/app/src/main/res/drawable/due_overdue_background.xml deleted file mode 100644 index 658797d91..000000000 --- a/app/src/main/res/drawable/due_overdue_background.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/due_overdue" /> - - <corners - android:radius="4dp" /> -</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/due_today_background.xml b/app/src/main/res/drawable/due_today_background.xml deleted file mode 100644 index fc0a6a727..000000000 --- a/app/src/main/res/drawable/due_today_background.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/due_today" /> - - <corners - android:radius="4dp" /> -</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_time_24.xml b/app/src/main/res/drawable/ic_time_24.xml new file mode 100644 index 000000000..e0355a270 --- /dev/null +++ b/app/src/main/res/drawable/ic_time_24.xml @@ -0,0 +1,6 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="?attr/colorOnSurface" 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="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/> + <path android:fillColor="@android:color/white" android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_time_filled_24.xml b/app/src/main/res/drawable/ic_time_filled_24.xml new file mode 100644 index 000000000..77d3da030 --- /dev/null +++ b/app/src/main/res/drawable/ic_time_filled_24.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="?attr/colorOnSurface" 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="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM15.29,16.71L11,12.41V7h2v4.59l3.71,3.71L15.29,16.71z"/> +</vector> diff --git a/app/src/main/res/layout/item_card_compact.xml b/app/src/main/res/layout/item_card_compact.xml index 3a14b0d43..16336d4d4 100644 --- a/app/src/main/res/layout/item_card_compact.xml +++ b/app/src/main/res/layout/item_card_compact.xml @@ -52,15 +52,11 @@ app:srcCompat="@drawable/ic_sync_blue_24dp" tools:visibility="visible" /> - <com.google.android.material.textview.MaterialTextView + <it.niedermann.nextcloud.deck.ui.view.DueDateChip android:id="@+id/card_due_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawablePadding="@dimen/spacer_1hx" - android:gravity="center" - android:paddingHorizontal="@dimen/spacer_1x" - android:paddingVertical="@dimen/spacer_1hx" - app:drawableStartCompat="@drawable/calendar_blank_grey600_24dp" + tools:chipIcon="@drawable/ic_time_24" tools:text="tomorrow" /> <ImageView diff --git a/app/src/main/res/layout/item_card_default.xml b/app/src/main/res/layout/item_card_default.xml index 7454129f4..a46582418 100644 --- a/app/src/main/res/layout/item_card_default.xml +++ b/app/src/main/res/layout/item_card_default.xml @@ -54,15 +54,11 @@ app:srcCompat="@drawable/ic_sync_blue_24dp" tools:visibility="visible" /> - <androidx.appcompat.widget.AppCompatTextView + <it.niedermann.nextcloud.deck.ui.view.DueDateChip android:id="@+id/card_due_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawablePadding="@dimen/spacer_1hx" - android:gravity="center" - android:paddingHorizontal="@dimen/spacer_1x" - android:paddingVertical="@dimen/spacer_1hx" - app:drawableStartCompat="@drawable/calendar_blank_grey600_24dp" + tools:chipIcon="@drawable/ic_time_24" tools:text="tomorrow" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_card_default_only_title.xml b/app/src/main/res/layout/item_card_default_only_title.xml index 1739a2905..145023167 100644 --- a/app/src/main/res/layout/item_card_default_only_title.xml +++ b/app/src/main/res/layout/item_card_default_only_title.xml @@ -37,15 +37,11 @@ app:srcCompat="@drawable/ic_sync_blue_24dp" tools:visibility="visible" /> - <com.google.android.material.textview.MaterialTextView + <it.niedermann.nextcloud.deck.ui.view.DueDateChip android:id="@+id/card_due_date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawablePadding="@dimen/spacer_1hx" - android:gravity="center" - android:paddingHorizontal="@dimen/spacer_1x" - android:paddingVertical="@dimen/spacer_1hx" - app:drawableStartCompat="@drawable/calendar_blank_grey600_24dp" + tools:chipIcon="@drawable/ic_time_24" tools:text="tomorrow" /> <ImageView |