From 28bf84e05cc8f63a6217bb794894d4cc9450ba5d Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 16 Dec 2021 12:56:14 +0100
Subject: [PATCH] Fix search

---
 .../keepass/activities/GroupActivity.kt       | 21 ++++++---
 .../keepass/adapters/BreadcrumbAdapter.kt     |  2 +-
 app/src/main/res/layout/activity_group.xml    | 47 ++++++++++++++++---
 ..._breadcrumb_current.xml => item_group.xml} |  0
 4 files changed, 56 insertions(+), 14 deletions(-)
 rename app/src/main/res/layout/{item_breadcrumb_current.xml => item_group.xml} (100%)

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 649a35571..dec3fe365 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -86,6 +86,9 @@ class GroupActivity : DatabaseLockActivity(),
     private var lockView: View? = null
     private var toolbar: Toolbar? = null
     private var databaseNameView: TextView? = null
+    private var searchContainer: ViewGroup? = null
+    private var searchNumbers: TextView? = null
+    private var searchString: TextView? = null
     private var toolbarBreadcrumb: Toolbar? = null
     private var searchTitleView: View? = null
     private var toolbarAction: ToolbarAction? = null
@@ -139,6 +142,9 @@ class GroupActivity : DatabaseLockActivity(),
         addNodeButtonView = findViewById(R.id.add_node_button)
         toolbar = findViewById(R.id.toolbar)
         databaseNameView = findViewById(R.id.database_name)
+        searchContainer = findViewById(R.id.search_container)
+        searchNumbers = findViewById(R.id.search_numbers)
+        searchString = findViewById(R.id.search_string)
         toolbarBreadcrumb = findViewById(R.id.toolbar_breadcrumb)
         searchTitleView = findViewById(R.id.search_title)
         breadcrumbListView = findViewById(R.id.breadcrumb_list)
@@ -524,13 +530,17 @@ class GroupActivity : DatabaseLockActivity(),
 
     private fun assignGroupViewElements(group: Group?) {
         // Assign title
-
         if (group?.isVirtual == true) {
-            searchTitleView?.visibility = View.VISIBLE
+            searchContainer?.visibility = View.VISIBLE
+            val title = group.title
+            searchString?.text = if (title.isNotEmpty()) title else ""
+            searchNumbers?.text = group.numberOfChildEntries.toString()
+            databaseNameView?.visibility = View.GONE
             toolbarBreadcrumb?.navigationIcon = null
             toolbarBreadcrumb?.visibility = View.GONE
         } else {
-            searchTitleView?.visibility = View.GONE
+            searchContainer?.visibility = View.GONE
+            databaseNameView?.visibility = View.VISIBLE
             // Assign the group icon depending of IconPack or custom icon
             group?.let {
                 if (group.containsParent())
@@ -539,12 +549,11 @@ class GroupActivity : DatabaseLockActivity(),
                     toolbarBreadcrumb?.navigationIcon = null
                 }
             }
+            // Assign number of children
+            mBreadcrumbAdapter?.setNode(group)
             toolbarBreadcrumb?.visibility = View.VISIBLE
         }
 
-        // Assign number of children
-        mBreadcrumbAdapter?.setNode(group)
-
         // Hide button
         initAddButton(group)
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
index 0af540b2c..0bee7269a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
@@ -69,7 +69,7 @@ class BreadcrumbAdapter(val context: Context)
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BreadcrumbGroupViewHolder {
         return BreadcrumbGroupViewHolder(inflater.inflate(
             when (viewType) {
-                0 -> R.layout.item_breadcrumb_current
+                0 -> R.layout.item_group
                 else -> R.layout.item_breadcrumb
             }, parent, false)
         )
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 70c7355b5..fa92b5131 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -44,16 +44,49 @@
             android:id="@+id/database_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            tools:text="Database"
             style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary" />
+        <RelativeLayout
+            android:id="@+id/search_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/search_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/search_results"
+                style="@style/KeepassDXStyle.TextAppearance.Default.TextOnPrimary" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/search_numbers"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="3"
+                android:layout_margin="4dp"
+                android:layout_below="@+id/search_title"
+                style="@style/KeepassDXStyle.TextAppearance.Info" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/search_string"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/search"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:layout_marginTop="2dp"
+                android:layout_marginStart="4dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginRight="4dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:layout_below="@+id/search_title"
+                android:layout_toRightOf="@+id/search_numbers"
+                android:layout_toEndOf="@+id/search_numbers"
+                style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary" />
+        </RelativeLayout>
     </androidx.appcompat.widget.Toolbar>
 
-    <TextView android:id="@+id/search_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/search_results"
-        android:visibility="gone"
-        style="@style/KeepassDXStyle.TextAppearance.Default.TextOnPrimary" />
-
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/group_coordinator"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_breadcrumb_current.xml b/app/src/main/res/layout/item_group.xml
similarity index 100%
rename from app/src/main/res/layout/item_breadcrumb_current.xml
rename to app/src/main/res/layout/item_group.xml