Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-deck.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2024-01-18 15:30:06 +0300
committerStefan Niedermann <info@niedermann.it>2024-01-18 15:30:06 +0300
commiteea21c772af0b525674837ff3aa3d1e6ec9d380b (patch)
tree641142c8920e5dc8ba3ef06ecd8518be47d53e2f /app/src/main/res
parent55abed7577387ba3b2167238882e81b80ce4cba5 (diff)
feat(done): Allow filtering for (un)done cards
Refs: #1556 https://github.com/nextcloud/deck/issues/5406 Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/dialog_filter.xml2
-rw-r--r--app/src/main/res/layout/dialog_filter_done.xml10
-rw-r--r--app/src/main/res/layout/item_filter_donetype.xml29
-rw-r--r--app/src/main/res/values/strings.xml5
4 files changed, 45 insertions, 1 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/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/values/strings.xml b/app/src/main/res/values/strings.xml
index ec1b84a5d..dabf27783 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -197,6 +197,10 @@
<string name="filter_no_due">No due date</string>
<string name="filter_later">Later</string>
+ <string name="filter_done_no_filter">All</string>
+ <string name="filter_done_done">Completed</string>
+ <string name="filter_done_undone">Uncompleted</string>
+
<string name="archived_cards">Archived cards</string>
<string name="attachment_already_exists">Attachment already exists</string>
<string name="pick_custom_color">Pick custom color</string>
@@ -208,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>