Merge lp:~donadigo/appcenter/updates-show-loading into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

- Show a spinner when loading apps in Updates page.

This branch fixes that when opening AppCenter and immediatly going to Updates, the page will show that there are no results and after all apps are loaded the view is presented. Now the page will show a spinner instead of no results message.

[Jeremy Wootten (jeremywootten)]

I could not get this to work as it stands - See inline comments.

This will conflict with the restructuring branches, but not badly.

review: Needs Fixing

Unmerged revisions

238. By Adam Bieńkowski on 2016-07-04

Show spinner when loading apps in Updates page

=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2016-06-26 23:28:28 +0000
+++ src/Views/AppListView.vala	2016-07-04 22:13:07 +0000
@@ -20,7 +20,7 @@
 
 using AppCenterCore;
 
-public class AppCenter.Views.AppListView : Gtk.ScrolledWindow {
+public class AppCenter.Views.AppListView : Gtk.Grid {
     public signal void show_app (AppCenterCore.Package package);
 
     private bool _updating_cache = true;
@@ -39,7 +39,9 @@
     }
 
     private bool updates_on_top;
+    private Gtk.Stack stack;
     private Gtk.ListBox list_box;
+    private Gtk.Spinner spinner;
     private Gtk.SizeGroup update_button_group;
 
     public AppListView (bool updates_on_top = false) {
@@ -50,9 +52,22 @@
     }
 
     construct {
-        hscrollbar_policy = Gtk.PolicyType.NEVER;
         var alert_view = new Granite.Widgets.AlertView (_("No Results"), _("No apps could be found. Try changing search terms."), "edit-find-symbolic");
         alert_view.show_all ();
+
+        stack = new Gtk.Stack ();
+
+        var spinner_box = new Gtk.Grid ();
+        spinner_box.expand = true;
+        spinner_box.show_all ();
+
+        spinner = new Gtk.Spinner ();
+        spinner.halign = Gtk.Align.CENTER;
+        spinner.valign = Gtk.Align.CENTER;
+
+        var scrolled_window = new Gtk.ScrolledWindow (null, null);
+        scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER;
+
         list_box = new Gtk.ListBox ();
         list_box.expand = true;
         list_box.activate_on_single_click = true;
@@ -64,7 +79,12 @@
                 show_app (packagerow.package);
             }
         });
-        add (list_box);
+
+        scrolled_window.add (list_box);
+
+        stack.add_named (scrolled_window, "list");
+        stack.add_named (spinner, "spinner");
+        add (stack);
 
         update_button_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
     }
@@ -96,6 +116,16 @@
         return tree_set;
     }
 
+    public void set_show_spinner (bool show) {
+        if (show) {
+            spinner.start ();
+            stack.set_visible_child_name ("spinner");
+        } else {
+            spinner.stop ();
+            stack.set_visible_child_name ("list");
+        }
+    }
+
     public void clear () {
         list_box.get_children ().foreach ((child) => {
             child.destroy ();

=== modified file 'src/Views/InstalledView.vala'
--- src/Views/InstalledView.vala	2016-06-25 15:34:25 +0000
+++ src/Views/InstalledView.vala	2016-07-04 22:13:07 +0000
@@ -49,6 +49,7 @@
     }
 
     public async void get_apps () {
+        app_list_view.set_show_spinner (true);
         unowned Client client = Client.get_default ();
 
         var installed_apps = yield client.get_installed_applications ();
@@ -56,6 +57,7 @@
             app_list_view.add_package (app);
         }
 
+        app_list_view.set_show_spinner (false);
         yield client.get_updates ();
     }