diff options
Diffstat (limited to 'app/src/main/res')
42 files changed, 261 insertions, 211 deletions
diff --git a/app/src/main/res/animator/appbar_elevation_off.xml b/app/src/main/res/animator/appbar_elevation_off.xml deleted file mode 100644 index d24dcb340..000000000 --- a/app/src/main/res/animator/appbar_elevation_off.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <objectAnimator - android:propertyName="elevation" - android:valueTo="0dp" - android:valueType="floatType" /> - </item> -</selector> diff --git a/app/src/main/res/animator/appbar_elevation_on.xml b/app/src/main/res/animator/appbar_elevation_on.xml deleted file mode 100644 index 6bd52cf3b..000000000 --- a/app/src/main/res/animator/appbar_elevation_on.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - tools:ignore="PrivateResource"> - <item> - <objectAnimator - android:propertyName="elevation" - android:valueTo="@dimen/design_appbar_elevation" - android:valueType="floatType" /> - </item> -</selector> diff --git a/app/src/main/res/drawable-hdpi/ic_splash_screen.png b/app/src/main/res/drawable-hdpi/ic_splash_screen.png Binary files differdeleted file mode 100644 index 070efc396..000000000 --- a/app/src/main/res/drawable-hdpi/ic_splash_screen.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/ic_splash_screen.png b/app/src/main/res/drawable-mdpi/ic_splash_screen.png Binary files differdeleted file mode 100644 index 0a3717448..000000000 --- a/app/src/main/res/drawable-mdpi/ic_splash_screen.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/ic_splash_screen.png b/app/src/main/res/drawable-xhdpi/ic_splash_screen.png Binary files differdeleted file mode 100644 index bfe6dca49..000000000 --- a/app/src/main/res/drawable-xhdpi/ic_splash_screen.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/ic_splash_screen.png b/app/src/main/res/drawable-xxhdpi/ic_splash_screen.png Binary files differdeleted file mode 100644 index c34788f0e..000000000 --- a/app/src/main/res/drawable-xxhdpi/ic_splash_screen.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png b/app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png Binary files differdeleted file mode 100644 index 32c45e466..000000000 --- a/app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png +++ /dev/null diff --git a/app/src/main/res/drawable/bottom_sheet_rounded.xml b/app/src/main/res/drawable/bottom_sheet_rounded.xml deleted file mode 100644 index ba266ed32..000000000 --- a/app/src/main/res/drawable/bottom_sheet_rounded.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="?attr/colorSurface" /> - <corners - android:topLeftRadius="16dp" - android:topRightRadius="16dp" /> - -</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml deleted file mode 100644 index 8a1da5d66..000000000 --- a/app/src/main/res/drawable/circle.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="ring" - android:innerRadiusRatio="2.5" - android:thickness="4dp" - android:useLevel="true"> - <solid android:color="@color/defaultBrand" /> -</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/due_tomorrow_background.xml b/app/src/main/res/drawable/due_tomorrow_background.xml deleted file mode 100644 index a986c42e2..000000000 --- a/app/src/main/res/drawable/due_tomorrow_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_tomorrow" /> - - <corners - android:radius="4dp" /> -</shape>
\ No newline at end of file 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/drawable/ic_check_circle_24.xml b/app/src/main/res/drawable/ic_check_circle_24.xml new file mode 100644 index 000000000..45c61fa3f --- /dev/null +++ b/app/src/main/res/drawable/ic_check_circle_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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_format_paint_grey600_24dp.xml b/app/src/main/res/drawable/ic_format_paint_grey600_24dp.xml deleted file mode 100644 index a2308a55f..000000000 --- a/app/src/main/res/drawable/ic_format_paint_grey600_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:autoMirrored="true" android:height="24dp" - android:tint="#757575" android:viewportHeight="24.0" - android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FF000000" android:pathData="M18,4V3c0,-0.55 -0.45,-1 -1,-1H5c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1V6h1v4H9v11c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-9h8V4h-3z"/> -</vector> 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/drawable/splash_screen.xml b/app/src/main/res/drawable/splash_screen.xml deleted file mode 100644 index d22531b3f..000000000 --- a/app/src/main/res/drawable/splash_screen.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:drawable="@color/defaultBrand" /> - - <item> - <bitmap - android:gravity="center" - android:src="@drawable/ic_splash_screen" /> - </item> - -</layer-list>
\ No newline at end of file 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" diff --git a/app/src/main/res/menu/archived_card_menu.xml b/app/src/main/res/menu/archived_card_menu.xml deleted file mode 100644 index 12448e691..000000000 --- a/app/src/main/res/menu/archived_card_menu.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - <item - android:id="@+id/action_card_dearchive" - android:title="@string/action_card_dearchive" - app:showAsAction="never" /> - - <item - android:id="@+id/action_card_delete" - android:title="@string/action_card_delete" - app:showAsAction="never" /> -</menu> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3e9f08068..7eff416c2 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -268,6 +268,7 @@ <string name="manage_list">إدارة القائمة </string> <string name="simple_reply">رد</string> <string name="append_text_to_description">إلحاق بالوصف </string> + <string name="append_text_as_task">إلحاق بالوصف كمُهمة</string> <string name="add_text_as_comment">أضف كتعليق</string> <string name="progress_count">%1$d من %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml index 42429e20b..9f4290cd8 100644 --- a/app/src/main/res/values-b+en+001/strings.xml +++ b/app/src/main/res/values-b+en+001/strings.xml @@ -260,6 +260,7 @@ <string name="manage_list">Manage list</string> <string name="simple_reply">Reply</string> <string name="append_text_to_description">Append to description</string> + <string name="append_text_as_task">Append to description as task</string> <string name="add_text_as_comment">Add as comment</string> <string name="progress_count">%1$d of %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fd0ca7c55..5de3c231a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -260,6 +260,7 @@ <string name="manage_list">Liste verwalten</string> <string name="simple_reply">Antworten</string> <string name="append_text_to_description">An Beschreibung anhängen</string> + <string name="append_text_as_task">Als Aufgabe an Beschreibung anhängen</string> <string name="add_text_as_comment">Als Kommentar hinzufügen</string> <string name="progress_count">%1$d von %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 29de8ad78..ce08f5ea0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -262,6 +262,7 @@ <string name="manage_list">Administrar su lista</string> <string name="simple_reply">Responder</string> <string name="append_text_to_description">Añadir a la descripción</string> + <string name="append_text_as_task">Añadir a la descripción como tarea</string> <string name="add_text_as_comment">Añadir como comentario</string> <string name="progress_count">%1$d de %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 79c9785d5..680e4e4ae 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -158,6 +158,7 @@ <string name="title_is_mandatory">Il titolo è richiesto</string> <string name="provide_at_least_a_title_or_description">Fornisci almeno un titolo e una descrizione</string> <string name="welcome_text">Benvenuto in %1$s</string> + <string name="welcome_text_further_accounts">Aggiungi un altro account</string> <string name="maintenance_mode_explanation">Il server %1$s attualmente è in manutenzione. Contatta l\'amministratore o riprova più tardi.</string> <string name="share_add_to_card">Aggiungi a scheda</string> <string name="share_success">Aggiunto %1$s a %2$s correttamente</string> @@ -261,6 +262,7 @@ <string name="manage_list">Gestisci elenco</string> <string name="simple_reply">Rispondi</string> <string name="append_text_to_description">Aggiungi alla descrizione</string> + <string name="append_text_as_task">Accoda alla descrizione come attività</string> <string name="add_text_as_comment">Aggiungi come commento</string> <string name="progress_count">%1$d di %2$d</string> <plurals name="progress_error_count"> @@ -336,5 +338,8 @@ <string name="card_outdated">Il contenuto di questa scheda potrebbe essere obsoleto.</string> <string name="show_error">Mostra errore</string> <string name="push_notification_link_empty">A causa di un problema noto nella web app di Deck, sfortunatamente non possiamo mostrare questa scheda. Per altre informazioni vedi: %1$s</string> + <string name="enter_search_term_title">Inserisci termine di ricerca</string> + <string name="enter_search_term_description">Inserisci il termine di ricerca per trovare schede in questa lavagna</string> <string name="no_search_results_title">Nessun risultato di ricerca</string> - </resources> + <string name="no_search_results_description">Non abbiamo trovato alcun risultato per il termine di ricerca scelto</string> +</resources> diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index b59427909..b301f9652 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -260,6 +260,7 @@ <string name="manage_list">Håndtere liste</string> <string name="simple_reply">Svar</string> <string name="append_text_to_description">Legg til beskrivelsen</string> + <string name="append_text_as_task">Legg til beskrivelse som oppgave</string> <string name="add_text_as_comment">Legg til som kommentar</string> <string name="progress_count">%1$d av %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index d3e6cb425..81e38f628 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -34,10 +34,10 @@ <!-- ======================================= --> <!-- Due Date badges --> - <color name="due_tomorrow">#232323</color> - <color name="due_today">#ac7c06</color> - <color name="due_overdue">#aa2926</color> - <color name="due_text_tomorrow">#ffffff</color> - <color name="due_text_today">#ffffff</color> - <color name="due_text_overdue">#ffffff</color> + <color name="due_today">#19c28900</color> + <color name="due_overdue">#19ee312b</color> + <color name="due_done">#1936914e</color> + <color name="due_text_today">#c28900</color> + <color name="due_text_overdue">#f36864</color> + <color name="due_text_done">#3ea75a</color> </resources> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 5b1719cb3..35e6fe1c6 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -262,6 +262,7 @@ <string name="manage_list">Управљај списком</string> <string name="simple_reply">Одговори</string> <string name="append_text_to_description">Придодај на опис</string> + <string name="append_text_as_task">Надовежи опису као задатак</string> <string name="add_text_as_comment">Додај као коментар</string> <string name="progress_count">%1$d од %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e080853cd..488f44679 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -260,6 +260,7 @@ <string name="manage_list">Hantera lista</string> <string name="simple_reply">Svara</string> <string name="append_text_to_description">Lägg till beskrivning</string> + <string name="append_text_as_task">Lägg till i beskrivningen som uppgift</string> <string name="add_text_as_comment">Lägg till som kommentar</string> <string name="progress_count">%1$d av %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 553f877cb..3335a9f43 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -258,6 +258,7 @@ <string name="manage_list">管理清單</string> <string name="simple_reply">回覆</string> <string name="append_text_to_description">附加到描述</string> + <string name="append_text_as_task">附加到描述作為任務</string> <string name="add_text_as_comment">新增為留言</string> <string name="progress_count">%1$d 之 %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0ebb20c27..8ccf1db22 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -258,6 +258,7 @@ <string name="manage_list">管理清單</string> <string name="simple_reply">回覆</string> <string name="append_text_to_description">附加到描述</string> + <string name="append_text_as_task">附加到描述作為工作項目</string> <string name="add_text_as_comment">新增為留言</string> <string name="progress_count">%1$d 之 %2$d</string> <plurals name="progress_error_count"> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 715f8b814..8e70e68ea 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -8,4 +8,7 @@ <attr name="description" format="string" /> <attr name="image" format="reference" /> </declare-styleable> + <declare-styleable name="DueDateChip"> + <attr name="compactMode" format="boolean" /> + </declare-styleable> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c6536b902..1b9a313f4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -38,12 +38,12 @@ <!-- ======================================= --> <!-- Due Date badges --> - <color name="due_tomorrow">#f2f2f2</color> - <color name="due_today">#f1c14b</color> - <color name="due_overdue">#ef6e6b</color> - <color name="due_text_tomorrow">#666666</color> - <color name="due_text_today">#333333</color> - <color name="due_text_overdue">#ffffff</color> + <color name="due_today">#f8f2e5</color> + <color name="due_overdue">#fbe7e6</color> + <color name="due_done">#e9f1eb</color> + <color name="due_text_today">#855d00</color> + <color name="due_text_overdue">#c61610</color> + <color name="due_text_done">#286c39</color> <!-- Activity --> <color name="activity_create">#00D400</color> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c6eca37fa..4b59ce20d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,7 +5,6 @@ <string name="navigation_drawer_close">Close navigation drawer</string> <string name="hint_search_deck">Search deck</string> - <string name="simple_boards">Boards</string> <string name="simple_add">Add</string> <string name="simple_save">Save</string> <string name="simple_more">More</string> @@ -16,11 +15,9 @@ <string name="simple_error">Error</string> <string name="simple_exception">Exception</string> <string name="simple_close">Close</string> - <string name="simple_open">Open</string> - <string name="simple_switch">Switch</string> <string name="simple_filter">Filter</string> - <string name="simple_overdue">Overdue</string> - <string name="simple_clear">Clear</string> + <string name="simple_completed">Completed</string> + <string name="simple_reset">Reset</string> <string name="simple_discard">Discard</string> <string name="simple_update">Update</string> <string name="simple_delete">Delete</string> @@ -32,7 +29,6 @@ <string name="simple_select">Select</string> <string name="simple_comment">Comment</string> <string name="simple_disabled">disabled</string> - <string name="simple_copied">Copied</string> <string name="simple_archive">Archive</string> <string name="simple_unassigned">Unassigned</string> <string name="hint_error_appeared">An error appeared</string> @@ -97,6 +93,8 @@ <string name="add_board">Add board</string> <string name="label_clear_due_date">Clear due date</string> + <string name="label_clear_done">Not completed</string> + <string name="label_due_at">Due at: %1$s</string> <string name="label_add">Add %1$s</string> <string name="url_maintainer" translatable="false">https://www.niedermann.it/</string> @@ -112,6 +110,7 @@ <string name="url_fragment_server_logs" translatable="false">/index.php/settings/admin/logging</string> <string name="url_fragment_share_card_pre_1_0_0" translatable="false">/index.php/apps/deck/#!/board/%1$d/card/%2$d</string> <string name="url_fragment_share_card_since_1_0_0" translatable="false">/index.php/apps/deck/#/board/%1$d/card/%2$d</string> + <string name="url_fragment_share_card_since_1_12_0" translatable="false">/index.php/apps/deck/board/%1$d/card/%2$d</string> <string name="card_edit_details">Details</string> <string name="card_edit_attachments">Attachments</string> @@ -120,9 +119,7 @@ <string name="no_files_attached_to_this_card">There are no files attached to this card.</string> <string name="attachments">Attachments</string> <string name="no_cards">No cards yet</string> - <string name="no_account">No account configured</string> <string name="account_already_added">The account %1$s has already been added</string> - <string name="account_is_getting_imported">Account is getting imported</string> <string name="not_synced_yet">Not synced yet</string> <string name="no_lists_yet">No lists yet</string> <string name="do_you_want_to_save_your_changes">Do you want to save your changes?</string> @@ -138,11 +135,9 @@ </plurals> <string name="add_a_new_list_using_the_button">Add a new list using the + button</string> <string name="add_a_new_card_using_the_button">Add a new card using the + button</string> - <string name="update_deck">Update Deck web app</string> <string name="deck_outdated_please_update">Your Deck web app version is too old (%1$s). Please update to use this Android app as client.</string> <string name="delete_board_message">This will permanently delete this board including all lists and cards.</string> <string name="settings_theme_title">Theme</string> - <string name="settings_branding_title">Branding</string> <string name="settings_compact_title">Compact mode</string> <string name="settings_cover_images_title">Cover images</string> <string name="settings_debugging">Debug logs</string> @@ -178,7 +173,6 @@ <string name="provide_at_least_a_title_or_description">Provide at least a title or description</string> <string name="welcome_text">Welcome to %1$s</string> <string name="welcome_text_further_accounts">Add another account</string> - <string name="maintenance_mode_explanation">The server %1$s is currently in maintenance mode. Please contact your administrator or try later again.</string> <string name="share_add_to_card">Add to card</string> <string name="share_success">Successfully added %1$s to %2$s</string> <string name="add_comment">Add comment</string> @@ -187,7 +181,6 @@ <string name="no_boards">No boards yet</string> <string name="add_a_new_board_using_the_button">Add a new board using the + button</string> <string name="choose_board">Choose board</string> - <string name="choose_list">Choose list</string> <string name="task_count">%1$s/%2$s</string> <string name="open_in_browser">Open in browser</string> <string name="updating_card">Updating card…</string> @@ -203,13 +196,12 @@ <string name="filter_month">Next 30 days</string> <string name="filter_no_due">No due date</string> <string name="filter_later">Later</string> - <string name="filter_by_tag">Filter by tag</string> - <string name="filter_by_assigned_user">Filter by assigned user</string> - <string name="filter_by_duedate">Filter by due date</string> + + <string name="filter_done_no_filter">All</string> + <string name="filter_done_done">Completed</string> + <string name="filter_done_undone">Not completed</string> <string name="archived_cards">Archived cards</string> - <string name="action_card_dearchive">Undo card archiving</string> - <string name="action_archived_cards">Browse archived cards</string> <string name="attachment_already_exists">Attachment already exists</string> <string name="pick_custom_color">Pick custom color</string> <string name="manage_tags">Manage tags</string> @@ -220,6 +212,7 @@ <string name="filter_tags_title">Tags</string> <string name="filter_user_title">Users</string> <string name="filter_duedate_title">Due date</string> + <string name="filter_done_title">Completed</string> <string name="action_board_dearchive">Undo board archiving</string> <string name="archived_boards">Archived boards</string> @@ -230,7 +223,6 @@ <string name="error_revoking_ac">Error while revoking the access for %1$s</string> <string name="error_create_label">Error while creating label %1$s</string> <string name="maintenance_mode">Server is in maintenance mode</string> - <string name="server_error">Server error</string> <string name="error_edit_activity_killed_by_android">Android finished the edit mode because it needed more system resources for other apps.</string> <string name="error_dialog_title">Oh no - What now? 🙁</string> @@ -298,10 +290,8 @@ <string name="card_does_not_yet_exist">Card does not yet exist in Deck</string> <string name="widget_stack_title">List</string> - <string name="widget_filter_title">Filter</string> <string name="widget_stack_header_icon">Widget header icon</string> <string name="widget_placeholder_icon">Widget placeholder icon</string> - <string name="select_stack">Select list</string> <string name="project_type_deck_board">Deck board</string> <string name="project_type_deck_card">Deck card</string> <string name="project_type_file">File</string> @@ -319,9 +309,6 @@ <string name="simple_clone">Clone</string> <string name="user_avatar">User avatar</string> <string name="simple_unassign">Unassign</string> - <string name="simple_contact">Contact</string> - <string name="simple_file">File</string> - <string name="simple_camera">Camera</string> <string name="take_photo">Take a photo</string> <string name="take_photo_switch_camera">Switch camera</string> <string name="take_photo_toggle_torch">Toggle torch</string> |
