From 0f22f8af45033210b5d6d61ab1ff6a8406df6b31 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Fri, 27 Jul 2018 10:54:58 +0200
Subject: [PATCH] Add search title

---
 .../com/kunzisoft/keepass/activities/GroupActivity.java    | 7 +++++++
 .../kunzisoft/keepass/database/search/SearchDbHelper.java  | 2 +-
 app/src/main/res/layout/list_nodes_with_add_button.xml     | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java
index 2f54bb21b..a96168bed 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java
@@ -112,6 +112,7 @@ public class GroupActivity extends LockingActivity
     private static final String NODE_TO_MOVE_KEY = "NODE_TO_MOVE_KEY";
 
     private Toolbar toolbar;
+    private View searchTitleView;
     private ExpandableLayout toolbarPasteExpandableLayout;
     private Toolbar toolbarPaste;
     private ImageView iconView;
@@ -219,6 +220,7 @@ public class GroupActivity extends LockingActivity
         iconView = findViewById(R.id.icon);
         addNodeButtonView = findViewById(R.id.add_node_button);
         toolbar = findViewById(R.id.toolbar);
+        searchTitleView = findViewById(R.id.search_title);
         groupNameView = findViewById(R.id.group_name);
         toolbarPasteExpandableLayout = findViewById(R.id.expandable_toolbar_paste_layout);
         toolbarPaste = findViewById(R.id.toolbar_paste);
@@ -408,6 +410,11 @@ public class GroupActivity extends LockingActivity
                 }
             }
         }
+        if (currentGroupIsASearch) {
+            searchTitleView.setVisibility(View.VISIBLE);
+        } else {
+            searchTitleView.setVisibility(View.GONE);
+        }
 
         // Assign icon
         if (currentGroupIsASearch) {
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchDbHelper.java b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchDbHelper.java
index fd4a7a989..91351aa69 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchDbHelper.java
+++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchDbHelper.java
@@ -59,7 +59,7 @@ public class SearchDbHelper<PwDatabaseVersion extends PwDatabase<PwGroupSearch,
 	public PwGroupSearch search(PwDatabaseVersion pm, String qStr, int max) {
 
 		PwGroupSearch group = pm.createGroup();
-		group.setName(mCtx.getString(R.string.search_results));
+		group.setName("\"" + qStr + "\"");
 		group.setEntries(new ArrayList<>());
 		
 		// Search all entries
diff --git a/app/src/main/res/layout/list_nodes_with_add_button.xml b/app/src/main/res/layout/list_nodes_with_add_button.xml
index cf83ec1f7..7b6cb5bdb 100644
--- a/app/src/main/res/layout/list_nodes_with_add_button.xml
+++ b/app/src/main/res/layout/list_nodes_with_add_button.xml
@@ -64,6 +64,12 @@
                         android:layout_alignParentStart="true"
                         android:layout_below="@+id/toolbar"
                         android:orientation="vertical">
+                        <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.DefaultTextOnPrimary" />
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"