diff options
author | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2024-01-20 00:01:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-20 00:01:24 +0300 |
commit | 00eeee817ca231d22c7787e67b6ddd7ae04fdf28 (patch) | |
tree | e434ca03b3f1fac903624172638dc7484883fae1 /app/src/main/res/layout/fragment_card_edit_tab_details.xml | |
parent | b8ee8530fe796f3d13db41429f6a140c55dc22b8 (diff) | |
parent | 3ae26363d56157a0869dd6717ce6e069a4a8cc44 (diff) |
Merge pull request #1565 from stefan-niedermann/master
Merge master
Diffstat (limited to 'app/src/main/res/layout/fragment_card_edit_tab_details.xml')
-rw-r--r-- | app/src/main/res/layout/fragment_card_edit_tab_details.xml | 73 |
1 files changed, 7 insertions, 66 deletions
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" |