From 5f1413ea1fb4e753a45f67e6439fc3f779773ecb Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 31 Jan 2022 00:07:48 +0100
Subject: [PATCH] Fix collapse animation

---
 .../kunzisoft/keepass/activities/GroupActivity.kt    |  5 ++++-
 app/src/main/res/layout/activity_group.xml           | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index 932c450cc..cf35c2cb1 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -131,7 +131,10 @@ class GroupActivity : DatabaseLockActivity(),
 
         override fun onMenuItemActionCollapse(p0: MenuItem?): Boolean {
             searchContainer?.hideByFading()
-            searchAdvanceFiltersContainer?.visibility = View.GONE
+            if (searchAdvanceFiltersContainer?.visibility == View.VISIBLE) {
+                searchAdvanceFiltersContainer?.visibility = View.INVISIBLE
+                searchAdvanceFiltersContainer?.collapse()
+            }
             toolbarBreadcrumb?.showByFading()
             mSearchGroup = null
             loadGroup(mDatabase)
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index c135ce64a..121683df2 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -96,16 +96,16 @@
                 </androidx.appcompat.widget.Toolbar>
 
                 <LinearLayout
-                    android:id="@+id/search_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="?attr/actionBarSize"
-                    android:background="?attr/colorPrimary"
-                    android:orientation="vertical"
-                    android:visibility="gone">
+                    android:orientation="vertical">
                     <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/search_container"
                         android:layout_width="match_parent"
-                        android:layout_height="?attr/actionBarSize">
+                        android:background="?attr/colorPrimary"
+                        android:layout_height="?attr/actionBarSize"
+                        android:visibility="gone">
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/search_numbers"
                             style="@style/KeepassDXStyle.TextAppearance.Info"
@@ -121,7 +121,6 @@
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintLeft_toLeftOf="parent"
                             tools:text="3" />
-
                         <com.google.android.material.chip.ChipGroup
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -161,6 +160,7 @@
                         android:id="@+id/search_advance_filters"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/advanced_search_height"
+                        android:background="?attr/colorPrimary"
                         android:visibility="gone">
                         <com.google.android.material.chip.ChipGroup
                             android:layout_width="match_parent"