From bc7a1c332c3f51306d1338746146136ee8c16dd7 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 16 Dec 2021 16:49:56 +0100
Subject: [PATCH] Breadcrunb toolbar animation and remove back button

---
 .../keepass/activities/GroupActivity.kt       | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 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 f0bb32fe0..5faa47d7d 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -40,6 +40,7 @@ import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.*
@@ -159,10 +160,6 @@ class GroupActivity : DatabaseLockActivity(),
         toolbar?.title = ""
         setSupportActionBar(toolbar)
 
-        toolbarBreadcrumb?.setNavigationOnClickListener {
-            onBackPressed()
-        }
-
         mBreadcrumbAdapter = BreadcrumbAdapter(this).apply {
             // Open group on breadcrumb click
             onItemClickListener = { node, _ ->
@@ -537,21 +534,19 @@ class GroupActivity : DatabaseLockActivity(),
             searchNumbers?.text = group.numberOfChildEntries.toString()
             databaseNameView?.visibility = View.GONE
             toolbarBreadcrumb?.navigationIcon = null
-            toolbarBreadcrumb?.visibility = View.GONE
+            toolbarBreadcrumb?.collapse()
         } else {
             searchContainer?.visibility = View.GONE
             databaseNameView?.visibility = View.VISIBLE
-            // Assign the group icon depending of IconPack or custom icon
-            group?.let {
-                if (group.containsParent())
-                    toolbarBreadcrumb?.setNavigationIcon(R.drawable.ic_arrow_up_white_24dp)
-                else {
-                    toolbarBreadcrumb?.navigationIcon = null
+            // Refresh breadcrumb
+            if (toolbarBreadcrumb?.isVisible != true) {
+                mBreadcrumbAdapter?.setNode(null)
+                toolbarBreadcrumb?.expand {
+                    mBreadcrumbAdapter?.setNode(group)
                 }
+            } else {
+                mBreadcrumbAdapter?.setNode(group)
             }
-            // Assign number of children
-            mBreadcrumbAdapter?.setNode(group)
-            toolbarBreadcrumb?.visibility = View.VISIBLE
         }
 
         // Hide button