diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/dialog_filter.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/dialog_filter_done.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_card_edit_tab_details.xml | 73 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_card_compact.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_card_default.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_card_default_only_title.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_filter_donetype.xml | 29 | ||||
| -rw-r--r-- | app/src/main/res/layout/view_card_due_date.xml | 143 | ||||
| -rw-r--r-- | app/src/main/res/layout/widget_single_card.xml | 2 |
9 files changed, 200 insertions, 87 deletions
diff --git a/app/src/main/res/layout/dialog_filter.xml b/app/src/main/res/layout/dialog_filter.xml index b95c2b0c8..2b1e3499c 100644 --- a/app/src/main/res/layout/dialog_filter.xml +++ b/app/src/main/res/layout/dialog_filter.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:background="@null" app:tabInlineLabel="true" - app:tabMode="fixed" + app:tabMode="auto" app:tabUnboundedRipple="true" /> <androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/res/layout/dialog_filter_done.xml b/app/src/main/res/layout/dialog_filter_done.xml new file mode 100644 index 000000000..5cf3fedb0 --- /dev/null +++ b/app/src/main/res/layout/dialog_filter_done.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/doneType" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="?attr/dialogPreferredPadding" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/item_filter_duetype" />
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_edit_tab_details.xml b/app/src/main/res/layout/fragment_card_edit_tab_details.xml index 631bc342f..c39a00fc5 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_details.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_details.xml @@ -69,81 +69,22 @@ android:layout_marginTop="@dimen/spacer_1x" android:layout_marginBottom="@dimen/spacer_1hx" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" - app:layout_constraintBottom_toTopOf="@id/dueDateDateWrapper" + app:layout_constraintBottom_toTopOf="@id/cardDueDateView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/peopleWrapper" tools:listitem="@tools:sample/avatars" /> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/dueDateDateWrapper" - android:layout_width="0dp" + <it.niedermann.nextcloud.deck.ui.card.details.CardDueDateView + android:id="@+id/cardDueDateView" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/spacer_2x" - android:layout_marginEnd="@dimen/spacer_2x" - android:hint="@string/hint_due_date_date" - android:labelFor="@id/dueDateDate" app:layout_constraintBottom_toTopOf="@id/descriptionWrapper" - app:layout_constraintEnd_toStartOf="@id/dueDateTimeWrapper" - app:layout_constraintHorizontal_weight="2" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/assignees" - app:startIconDrawable="@drawable/calendar_blank_grey600_24dp"> - - <EditText - android:id="@+id/dueDateDate" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:enabled="true" - android:focusable="false" - android:importantForAutofill="no" - android:inputType="date" - android:maxLines="1" - tools:text="01/07/2020" /> - </com.google.android.material.textfield.TextInputLayout> + app:layout_constraintTop_toBottomOf="@id/assignees" /> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/dueDateTimeWrapper" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/spacer_1hx" - android:hint="@string/hint_due_date_time" - android:labelFor="@id/dueDateTime" - app:layout_constraintBottom_toBottomOf="@id/dueDateDateWrapper" - app:layout_constraintEnd_toStartOf="@id/clearDueDate" - app:layout_constraintHorizontal_weight="1" - app:layout_constraintStart_toEndOf="@id/dueDateDateWrapper" - app:layout_constraintTop_toTopOf="@id/dueDateDateWrapper"> - - <EditText - android:id="@+id/dueDateTime" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:enabled="true" - android:focusable="false" - android:importantForAutofill="no" - android:inputType="datetime" - android:maxLines="1" - android:minLines="0" - android:textAlignment="center" - tools:text="11:45" /> - </com.google.android.material.textfield.TextInputLayout> - - <ImageView - android:id="@+id/clearDueDate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginVertical="@dimen/spacer_1hx" - android:layout_marginStart="@dimen/spacer_1x" - android:layout_marginEnd="0dp" - android:contentDescription="@string/label_clear_due_date" - android:padding="@dimen/spacer_11qx" - android:translationY="@dimen/spacer_1hx" - app:layout_constraintBottom_toBottomOf="@id/dueDateTimeWrapper" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/dueDateTimeWrapper" - app:layout_constraintTop_toTopOf="@id/dueDateTimeWrapper" - app:srcCompat="@drawable/ic_close_circle_grey600" /> <RelativeLayout android:id="@+id/descriptionWrapper" @@ -153,7 +94,7 @@ app:layout_constraintBottom_toTopOf="@id/projectsTitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/dueDateDateWrapper"> + app:layout_constraintTop_toBottomOf="@id/cardDueDateView"> <com.google.android.material.textfield.TextInputLayout android:id="@+id/descriptionEditorWrapper" diff --git a/app/src/main/res/layout/item_card_compact.xml b/app/src/main/res/layout/item_card_compact.xml index 3a14b0d43..75d95f796 100644 --- a/app/src/main/res/layout/item_card_compact.xml +++ b/app/src/main/res/layout/item_card_compact.xml @@ -52,15 +52,12 @@ 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" + app:compactMode="true" + 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..3dfcff46e 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> @@ -103,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 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 diff --git a/app/src/main/res/layout/item_filter_donetype.xml b/app/src/main/res/layout/item_filter_donetype.xml new file mode 100644 index 000000000..9cf823c77 --- /dev/null +++ b/app/src/main/res/layout/item_filter_donetype.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:orientation="horizontal"> + + <TextView + android:id="@+id/doneType" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="middle" + android:padding="@dimen/spacer_2x" + android:textAppearance="?attr/textAppearanceListItem" + tools:text="@tools:sample/lorem" /> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/selected_check" + android:layout_width="22dp" + android:layout_height="22dp" + android:layout_marginStart="@dimen/spacer_1x" + app:layout_alignSelf="center" + app:layout_flexShrink="0" + app:srcCompat="@drawable/selected_check" + tools:src="@drawable/ic_check_grey600_24dp" /> + +</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/view_card_due_date.xml b/app/src/main/res/layout/view_card_due_date.xml new file mode 100644 index 000000000..77398f5b1 --- /dev/null +++ b/app/src/main/res/layout/view_card_due_date.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/doneCheck" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/spacer_1qx" + android:layout_marginEnd="0dp" + android:layout_marginBottom="@dimen/spacer_1hx" + android:contentDescription="@null" + android:padding="@dimen/spacer_11qx" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_check_white_24dp" + app:tint="?attr/colorOnSurface" + tools:visibility="gone" /> + + <TextView + android:id="@+id/doneDate" + style="?attr/textAppearanceBody1" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintBottom_toBottomOf="@id/doneCheck" + app:layout_constraintEnd_toStartOf="@id/clearDone" + app:layout_constraintStart_toEndOf="@id/doneCheck" + app:layout_constraintTop_toTopOf="@id/doneCheck" + tools:text="@tools:sample/date/ddmmyy" + tools:visibility="gone" /> + + <TextView + android:id="@+id/done_due_date" + style="?attr/textAppearanceBody1" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacer_1x" + app:layout_constraintEnd_toStartOf="@id/clearDone" + app:layout_constraintStart_toEndOf="@id/doneCheck" + app:layout_constraintTop_toBottomOf="@id/doneDate" + tools:text="@tools:sample/date/ddmmyy" + tools:visibility="gone" /> + + <ImageView + android:id="@+id/clearDone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginVertical="@dimen/spacer_1hx" + android:layout_marginStart="@dimen/spacer_1x" + android:layout_marginEnd="0dp" + android:contentDescription="@string/label_clear_done" + android:padding="@dimen/spacer_11qx" + app:layout_constraintBottom_toBottomOf="@id/doneDate" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/doneDate" + app:srcCompat="@drawable/ic_close_circle_grey600" + tools:visibility="gone" /> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/dueDateDateWrapper" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/spacer_2x" + android:hint="@string/hint_due_date_date" + android:labelFor="@id/dueDateDate" + app:layout_constraintBottom_toTopOf="@id/markAsDone" + app:layout_constraintEnd_toStartOf="@id/dueDateTimeWrapper" + app:layout_constraintHorizontal_weight="2" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/done_due_date" + app:startIconDrawable="@drawable/calendar_blank_grey600_24dp"> + + <EditText + android:id="@+id/dueDateDate" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:enabled="true" + android:focusable="false" + android:importantForAutofill="no" + android:inputType="date" + android:maxLines="1" + tools:text="01/07/2020" /> + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/dueDateTimeWrapper" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/spacer_1hx" + android:hint="@string/hint_due_date_time" + android:labelFor="@id/dueDateTime" + app:layout_constraintBottom_toBottomOf="@id/dueDateDateWrapper" + app:layout_constraintEnd_toStartOf="@id/clearDueDate" + app:layout_constraintHorizontal_weight="1" + app:layout_constraintStart_toEndOf="@id/dueDateDateWrapper" + app:layout_constraintTop_toTopOf="@id/dueDateDateWrapper"> + + <EditText + android:id="@+id/dueDateTime" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:enabled="true" + android:focusable="false" + android:importantForAutofill="no" + android:inputType="datetime" + android:maxLines="1" + android:minLines="0" + android:textAlignment="center" + tools:text="11:45" /> + </com.google.android.material.textfield.TextInputLayout> + + <ImageView + android:id="@+id/clearDueDate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginVertical="@dimen/spacer_1hx" + android:layout_marginStart="@dimen/spacer_1x" + android:layout_marginEnd="0dp" + android:contentDescription="@string/label_clear_due_date" + android:padding="@dimen/spacer_11qx" + android:translationY="@dimen/spacer_1hx" + app:layout_constraintBottom_toBottomOf="@id/dueDateTimeWrapper" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/dueDateTimeWrapper" + app:layout_constraintTop_toTopOf="@id/dueDateTimeWrapper" + app:srcCompat="@drawable/ic_close_circle_grey600" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/markAsDone" + style="@style/Widget.Material3.Button" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacer_2x" + android:layout_marginBottom="@dimen/spacer_1hx" + android:text="@string/simple_completed" + app:backgroundTint="@color/defaultBrand" + app:icon="@drawable/ic_check_white_24dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/dueDateDateWrapper" /> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/widget_single_card.xml b/app/src/main/res/layout/widget_single_card.xml index 5646b98f1..b868a59d5 100644 --- a/app/src/main/res/layout/widget_single_card.xml +++ b/app/src/main/res/layout/widget_single_card.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:contentDescription="@null" - tools:src="@drawable/calendar_blank_grey600_24dp" /> + tools:src="@drawable/ic_time_24" /> <TextView android:id="@+id/card_due_date" |