diff options
author | Stefan Niedermann <info@niedermann.it> | 2020-05-04 22:39:38 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2020-05-04 22:39:38 +0300 |
commit | f2d489494cdb175186e66a68f92daaecb01511f5 (patch) | |
tree | 7af3ba44e8c254fbec796757ce7ef4633607241f | |
parent | 9d1cedb74587b0238f2a9691679b70a7e975f192 (diff) |
Filter tabs
7 files changed, 14 insertions, 45 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterAssigneesFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterAssigneesFragment.java index 388a0d266..4ef9f1c76 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterAssigneesFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterAssigneesFragment.java @@ -43,6 +43,7 @@ public class FilterAssigneesFragment extends Fragment { binding.users.setNestedScrollingEnabled(false); binding.users.setAdapter(userAdapter); }); - return super.onCreateView(inflater, container, savedInstanceState); + + return binding.getRoot(); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDuedateFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDuedateFragment.java index 54970d1c3..50ee3f41c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDuedateFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDuedateFragment.java @@ -46,6 +46,6 @@ public class FilterDuedateFragment extends Fragment { filterInformation.setDueType(EDueType.NO_FILTER); } }); - return super.onCreateView(inflater, container, savedInstanceState); + return binding.getRoot(); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java index bf4b5edbf..59d0006ac 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java @@ -40,6 +40,6 @@ public class FilterLabelsFragment extends Fragment { binding.labels.setNestedScrollingEnabled(false); binding.labels.setAdapter(labelAdapter); }); - return super.onCreateView(inflater, container, savedInstanceState); + return binding.getRoot(); } } diff --git a/app/src/main/res/layout/dialog_filter.xml b/app/src/main/res/layout/dialog_filter.xml index d9b671890..bd6834966 100644 --- a/app/src/main/res/layout/dialog_filter.xml +++ b/app/src/main/res/layout/dialog_filter.xml @@ -14,6 +14,5 @@ <androidx.viewpager2.widget.ViewPager2 android:id="@+id/view_pager" android:layout_width="match_parent" - android:layout_height="400dp" - android:background="@color/primary" /> + android:layout_height="wrap_content" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/dialog_filter_assignees.xml b/app/src/main/res/layout/dialog_filter_assignees.xml index 2cb0831a0..c03375818 100644 --- a/app/src/main/res/layout/dialog_filter_assignees.xml +++ b/app/src/main/res/layout/dialog_filter_assignees.xml @@ -1,32 +1,11 @@ <?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/users" 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"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacer_3x" - android:layout_marginBottom="@dimen/spacer_1x" - android:labelFor="@id/overdue" - android:text="@string/filter_by_assigned_user" - android:textAppearance="?attr/textAppearancePopupMenuHeader" /> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/users" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:choiceMode="multipleChoice" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - tools:itemCount="4" - tools:listitem="@layout/item_filter_user" /> - </LinearLayout> -</ScrollView>
\ No newline at end of file + android:layout_height="wrap_content" + android:choiceMode="multipleChoice" + android:padding="?attr/dialogPreferredPadding" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/item_filter_user" />
\ No newline at end of file diff --git a/app/src/main/res/layout/dialog_filter_duedate.xml b/app/src/main/res/layout/dialog_filter_duedate.xml index a59216a72..858056bce 100644 --- a/app/src/main/res/layout/dialog_filter_duedate.xml +++ b/app/src/main/res/layout/dialog_filter_duedate.xml @@ -10,15 +10,6 @@ android:orientation="vertical" android:padding="?attr/dialogPreferredPadding"> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacer_3x" - android:layout_marginBottom="@dimen/spacer_1x" - android:labelFor="@id/overdue" - android:text="@string/filter_by_duedate" - android:textAppearance="?attr/textAppearancePopupMenuHeader" /> - <androidx.appcompat.widget.AppCompatSpinner android:id="@+id/overdue" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/dialog_filter_labels.xml b/app/src/main/res/layout/dialog_filter_labels.xml index 477911315..6d396a9c2 100644 --- a/app/src/main/res/layout/dialog_filter_labels.xml +++ b/app/src/main/res/layout/dialog_filter_labels.xml @@ -4,9 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/labels" android:layout_width="match_parent" - android:layout_height="300dp" - android:background="@color/mdtp_red" + android:layout_height="wrap_content" android:choiceMode="multipleChoice" + android:padding="?attr/dialogPreferredPadding" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - tools:itemCount="4" tools:listitem="@layout/item_filter_label" />
\ No newline at end of file |