Flatten due type filter list

3 files changed, 37 insertions, 19 deletions

diff --git a/app/src/main/res/layout/dialog_filter_duedate.xml b/app/src/main/res/layout/dialog_filter_duedate.xml
index 858056bce..37a73ca73 100644
--- a/app/src/main/res/layout/dialog_filter_duedate.xml
+++ b/app/src/main/res/layout/dialog_filter_duedate.xml
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<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/dueType"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="?attr/dialogPreferredPadding">
-
-        <androidx.appcompat.widget.AppCompatSpinner
-            android:id="@+id/overdue"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:prompt="@string/simple_overdue"
-            android:spinnerMode="dropdown"
-            tools:listitem="@android:layout/simple_list_item_1" />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+    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_duetype.xml b/app/src/main/res/layout/item_filter_duetype.xml
new file mode 100644
index 000000000..54726ae2f
--- /dev/null
+++ b/app/src/main/res/layout/item_filter_duetype.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/dueType"
+        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:layout_width="22dp"
+        android:layout_height="22dp"
+        android:layout_marginStart="@dimen/spacer_1x"
+        android:layout_marginLeft="@dimen/spacer_1x"
+        app:layout_alignSelf="center"
+        app:layout_flexShrink="0"
+        app:srcCompat="@drawable/selected"
+        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/item_filter_user.xml b/app/src/main/res/layout/item_filter_user.xml
index cb18d8013..8177a1c94 100644
--- a/app/src/main/res/layout/item_filter_user.xml
+++ b/app/src/main/res/layout/item_filter_user.xml
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:textSize="16sp"
+        android:textAppearance="?attr/textAppearanceListItem"
         tools:text="@tools:sample/full_names" />
 
 </LinearLayout>
\ No newline at end of file