Merge lp:~ddieter/appcenter/appcenter-search-category into lp:~elementary-apps/appcenter/appcenter

[Dieter Debast]

When viewing the apps in a specific category, it is now possible to use the search bar and search apps only in that category

When viewing the apps in a specific category, it is now possible to use the search bar and search apps only in that category. Using the search bar in the main window, still performs a search in all of the apps.

[Danielle Foré (danrabbit)]

I can confirm that this works as expected! Nice work :)

One thing that I think I'd like, but I don't think is a blocker on this branch would be to leave the back button there so that if you search and it turns up empty you can click that button to kind of expand your search back to all categories

review: Approve (ux)

[Danielle Foré (danrabbit)]

Ah I just thought of another thing that would be kind of nice would be if the hint text changed to reflect the category. So "Search Audio" "Search Education" etc. Would help for clarity I think

[lp:~ddieter/appcenter/appcenter-search-category]

311. By Dieter Debast on 2016-09-24

Change search bar placeholder depending on category

312. By Dieter Debast on 2016-09-25

Added a "Search All Apps" button

[Dieter Debast (ddieter)]

Thanks :)

I've made some changes. Is this what you had in mind?

[Artem Anufrij (artem-anufrij)]

Code looks very good.

review: Approve (cody style)

[Danielle Foré (danrabbit)]

I left a small diff comment. For proper translations, you want to do "Search %s" not "search" + var.

Also, please don't add a new string "Search All Apps". "Search Apps" is sufficient and already has translations.

review: Needs Fixing

[Danielle Foré (danrabbit)]

Also, please revert changes to pot files. We'll update those in a separate commit.

[Danielle Foré (danrabbit)]

ah I see what you've done with "Search All Apps". I don't know about hiding the button until there are 0 results. This seems kind of limiting, especially if you see that there isn't the desired result when there are half a dozen left. Probably should keep the button the whole time.

[lp:~ddieter/appcenter/appcenter-search-category]

313. By Dieter Debast on 2016-10-07

Always show "Search Apps" button

314. By Dieter Debast on 2016-10-07

Translation updates

315. By Dieter Debast on 2016-10-07

Improved Code

[Dieter Debast (ddieter)]

I've reverted the pot files, used the correct translation strings and the "Search Apps" button is now always shown when searching through categories

[Danielle Foré (danrabbit)]

afaict this works as intended, minimal string changes and seems translatable. I like it :)

review: Approve

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2016-09-24 01:53:02 +0000
+++ src/Core/Client.vala	2016-10-07 19:18:45 +0000
@@ -271,11 +271,11 @@
         return packages;
     }
 
-    public Gee.Collection<AppCenterCore.Package> get_applications_for_category (AppStream.Category category) {
+    public Gee.Collection<AppCenterCore.Package> search_applications (string? query, AppStream.Category? category) {
         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-        string categories = get_string_from_categories (category);
+        string categories = category == null ? null : get_string_from_categories (category);
         try {
-            var comps = appstream_database.find_components (null, categories);
+            var comps = appstream_database.find_components (query, categories);
             comps.foreach ((comp) => {
                 apps.add (package_list.get (comp.get_pkgnames ()[0]));
             });
@@ -306,20 +306,6 @@
         return categories;
     }
 
-    public Gee.Collection<AppCenterCore.Package> search_applications (string query) {
-        var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-        try {
-            var comps = appstream_database.find_components (query, null);
-            comps.foreach ((comp) => {
-                apps.add (package_list.get (comp.get_pkgnames ()[0]));
-            });
-        } catch (Error e) {
-            critical (e.message);
-        }
-
-        return apps;
-    }
-
     public Pk.Package? get_app_package (string application, Pk.Bitfield additional_filters = 0) throws GLib.Error {
         AppCenter.Task packages_task = request_task (false);
         Pk.Package? package = null;

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2016-09-07 18:38:31 +0000
+++ src/MainWindow.vala	2016-10-07 19:18:45 +0000
@@ -25,7 +25,10 @@
     private Views.CategoryView category_view;
     private Views.SearchView search_view;
     private Gtk.Button return_button;
+    private Gtk.Button search_all_button;
+    private Gtk.Stack button_stack;
     private ulong task_finished_connection = 0U;
+    private Gee.Deque<string> return_button_history;
     
     public static Views.InstalledView installed_view { get; private set; }
 
@@ -78,6 +81,7 @@
         });
 
         return_button.clicked.connect (view_return);
+        search_all_button.clicked.connect (search_all_apps);
 
         installed_view.get_apps.begin ();
 
@@ -94,6 +98,16 @@
         return_button = new Gtk.Button ();
         return_button.no_show_all = true;
         return_button.get_style_context ().add_class ("back-button");
+        return_button_history = new Gee.LinkedList<string> ();
+        
+        search_all_button = new Gtk.Button.with_label (_("Search Apps"));
+        search_all_button.no_show_all = true;
+        search_all_button.get_style_context ().add_class ("back-button");
+        
+        button_stack = new Gtk.Stack ();
+        button_stack.add (return_button);
+        button_stack.add (search_all_button);
+        button_stack.set_visible_child (return_button);
 
         view_mode = new Granite.Widgets.ModeButton ();
         view_mode.append_text (_("Categories"));
@@ -119,7 +133,7 @@
         headerbar = new Gtk.HeaderBar ();
         headerbar.show_close_button = true;
         headerbar.set_custom_title (custom_title_stack);
-        headerbar.pack_start (return_button);
+        headerbar.pack_start (button_stack);
         headerbar.pack_end (search_entry);
 
         set_titlebar (headerbar);
@@ -178,6 +192,7 @@
         unowned string research = search_entry.text;
         if (research.length < 2) {
             view_mode_revealer.reveal_child = true;
+            custom_title_stack.set_visible_child (view_mode_revealer);
             switch (view_mode.selected) {
                 case 0:
                     stack.visible_child = category_view;
@@ -186,16 +201,42 @@
                     stack.visible_child = installed_view;
                     break;
             }
+            if (!return_button_history.is_empty) {
+                return_button.no_show_all = false;
+                return_button.show_all ();
+            }
+            button_stack.visible_child = return_button;
+            search_all_button.no_show_all = true;
+            search_all_button.hide ();
         } else {
-            search_view.search.begin (research);
-            if (!return_button.visible) {
-                view_mode_revealer.reveal_child = false;
-                stack.visible_child = search_view;
-            }
+            search_view.search.begin (research, category_view.currently_viewed_category, () => {
+                if (category_view.currently_viewed_category != null) {
+                    button_stack.visible_child = search_all_button;
+                    search_all_button.no_show_all = false;
+                    search_all_button.show_all ();
+                } else {
+                    button_stack.visible_child = return_button;
+                    search_all_button.no_show_all = true;
+                    search_all_button.hide ();
+                }
+            });
+            view_mode_revealer.reveal_child = false;
+            stack.visible_child = search_view;
+            return_button.no_show_all = true;
+            return_button.hide ();
         }
     }
 
-    private void view_opened (string return_name, string? custom_header = null) {
+    private void view_opened (string return_name, bool allow_search, string? custom_header = null) {
+        if (stack.visible_child == search_view && category_view.currently_viewed_category != null) {
+            button_stack.visible_child = return_button;
+            search_all_button.no_show_all = true;
+            search_all_button.hide ();
+        }
+    
+        if (return_button_history.is_empty || return_button_history.peek_head () != return_name) {
+            return_button_history.offer_head (return_name);
+        }
         return_button.label = return_name;
         return_button.no_show_all = false;
         return_button.show_all ();
@@ -205,20 +246,58 @@
             category_header.label = custom_header;
             custom_title_stack.set_visible_child (category_header);
         }
-        search_entry.sensitive = false;
+
+        search_entry.sensitive = allow_search;
+        search_entry.grab_focus_without_selecting ();
+        if (stack.visible_child == category_view && category_view.currently_viewed_category != null) {
+            search_entry.placeholder_text = _("Search %s").printf (category_view.currently_viewed_category.get_name ());
+        }
     }
 
     private void view_return () {
-        view_mode_revealer.reveal_child = true;
-        custom_title_stack.set_visible_child (view_mode_revealer);
-        category_header.label = "";
-
+        if (stack.visible_child != search_view) {
+            view_mode_revealer.reveal_child = true;
+            custom_title_stack.set_visible_child (view_mode_revealer);
+            category_header.label = "";
+        } else {
+            if (category_view.currently_viewed_category != null) {
+                button_stack.visible_child = search_all_button;
+                search_all_button.no_show_all = false;
+                search_all_button.show_all ();
+            }
+        }
+        
+        if (stack.visible_child == category_view) {
+            search_entry.placeholder_text = _("Search Apps");
+        }
         search_entry.sensitive = true;
         search_entry.grab_focus_without_selecting ();
-        return_button.no_show_all = true;
-        return_button.hide ();
+
+        return_button_history.poll_head ();
+        if (!return_button_history.is_empty && stack.visible_child == search_view) {
+            return_button.label = return_button_history.peek_head ();
+            return_button.no_show_all = true;
+            return_button.hide ();
+        } else {
+            return_button.no_show_all = true;
+            return_button.hide ();
+        }
 
         View view = (View) stack.visible_child;
         view.return_clicked ();
     }
+    
+    private void search_all_apps () {
+        category_header.label = "";
+        
+        search_entry.placeholder_text = _("Search Apps");
+        search_entry.grab_focus_without_selecting ();
+        
+        return_button_history.poll_head ();
+        return_button.no_show_all = true;
+        return_button.hide ();
+    
+        category_view.return_clicked ();
+        trigger_search ();
+    }
 }

=== modified file 'src/Views/CategoryView.vala'
--- src/Views/CategoryView.vala	2016-09-07 18:38:31 +0000
+++ src/Views/CategoryView.vala	2016-10-07 19:18:45 +0000
@@ -25,6 +25,8 @@
     private Gtk.ScrolledWindow category_scrolled;
     private string current_category;
 
+    public AppStream.Category currently_viewed_category;
+
     public CategoryView () {
         
     }
@@ -42,6 +44,7 @@
         category_flow.child_activated.connect ((child) => {
             var item = child as Widgets.CategoryItem;
             if (item != null) {
+                currently_viewed_category = item.app_category;
                 show_app_list_for_category (item.app_category);
             }
         });
@@ -64,15 +67,16 @@
     public override void return_clicked () {
         if (current_category == null) {
             set_visible_child (category_scrolled);
+            currently_viewed_category = null;
         } else {
-            subview_entered (_("Categories"), current_category);
+            subview_entered (_("Categories"), true, current_category);
             set_visible_child_name (current_category);
             current_category = null;
         }
     }
 
     private void show_app_list_for_category (AppStream.Category category) {
-        subview_entered (_("Categories"), category.name);
+        subview_entered (_("Categories"), true, category.name);
         var child = get_child_by_name (category.name);
         if (child != null) {
             set_visible_child (child);
@@ -86,12 +90,12 @@
 
         app_list_view.show_app.connect ((package) => {
             current_category = category.name;
-            subview_entered (category.name, "");
+            subview_entered (category.name, false, "");
             show_package (package);
         });
 
         unowned Client client = Client.get_default ();
-        var apps = client.get_applications_for_category (category);
+        var apps = client.search_applications (null, category);
         foreach (var app in apps) {
             app_list_view.add_package (app);
         }

=== modified file 'src/Views/InstalledView.vala'
--- src/Views/InstalledView.vala	2016-09-17 19:28:03 +0000
+++ src/Views/InstalledView.vala	2016-10-07 19:18:45 +0000
@@ -42,7 +42,7 @@
         app_list_view = new AppListUpdateView ();
         add (app_list_view);
         app_list_view.show_app.connect ((package) => {
-            subview_entered (C_("view", "Updates"));
+            subview_entered (C_("view", "Updates"), false);
             show_package (package);
         });
     }

=== modified file 'src/Views/SearchView.vala'
--- src/Views/SearchView.vala	2016-08-20 16:51:58 +0000
+++ src/Views/SearchView.vala	2016-10-07 19:18:45 +0000
@@ -33,7 +33,7 @@
         add (app_list_view);
         app_list_view.show_app.connect ((package) => {
             /// TRANSLATORS: the name of the Search view
-            subview_entered (C_("view", "Search"));
+            subview_entered (C_("view", "Search"), false);
             show_package (package);
         });
     }
@@ -42,10 +42,10 @@
         set_visible_child (app_list_view);
     }
     
-    public async void search (string search_term) {
+    public async void search (string search_term, AppStream.Category? category) {
         app_list_view.clear ();
         unowned Client client = Client.get_default ();
-        var found_apps = client.search_applications (search_term);
+        var found_apps = client.search_applications (search_term, category);
         
         if (found_apps.size > 0) {
             var apps_array = found_apps.to_array ();

=== modified file 'src/Views/View.vala'
--- src/Views/View.vala	2016-09-07 18:38:31 +0000
+++ src/Views/View.vala	2016-10-07 19:18:45 +0000
@@ -19,7 +19,7 @@
  */
 
 public abstract class AppCenter.View : Gtk.Stack {
-    public signal void subview_entered (string view_name, string? custom_title = null);
+    public signal void subview_entered (string view_name, bool allow_search, string? custom_title = null);
 
     construct {
         get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);