Merge lp:~tintou/appcenter/lazy-loading into lp:~elementary-apps/appcenter/appcenter

[Corentin Noël]

Use lazy loading of apps in categories and search.
This removes the limit of results that can appear in the search view.

Load apps on-demand into the view

[Danielle Foré (danrabbit)]

I can confirm that all categories open instantly now!

But I feel like we need some kind of feedback to indicate that more results are being loaded when you scroll to the end. Can we temporarily pack a spinner?

[Danielle Foré (danrabbit)]

After talking to Corentin, it seems like just connected to `edge_reached` instead of `edge_overshot` fixes the issue I was experiencing

[lp:~tintou/appcenter/lazy-loading]

398. By Corentin Noël on 2017-02-15

Use lazy loading of apps in categories and search.

This removes the limit of results that can appear in the search view.

=== modified file 'src/AbstractAppList.vala'
--- src/AbstractAppList.vala	2016-09-14 16:58:13 +0000
+++ src/AbstractAppList.vala	2017-02-15 18:04:46 +0000
@@ -43,6 +43,15 @@
             action_button_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.BOTH);
         }
 
+        public virtual void add_packages (Gee.Collection<AppCenterCore.Package> packages) {
+            foreach (var package in packages) {
+                var row = make_row (package);
+                set_up_row (row);
+            }
+
+            after_add_remove_change_row ();
+        }
+
         public virtual void add_package (AppCenterCore.Package package) {
             var row = make_row (package);
             set_up_row (row);
@@ -64,7 +73,7 @@
             after_add_remove_change_row ();
         }
 
-        public void clear () {
+        public virtual void clear () {
             foreach (var r in list_box.get_children ()) {
                 var row = (Widgets.AppListRow)r;
                 if (row.has_package ()) {
@@ -85,7 +94,7 @@
 
         protected virtual void after_add_remove_change_row () {}
 
-        protected Gee.Collection<AppCenterCore.Package> get_packages () {
+        protected virtual Gee.Collection<AppCenterCore.Package> get_packages () {
             var tree_set = new Gee.TreeSet<AppCenterCore.Package> ();
             foreach (var r in list_box.get_children ()) {
                 var row = (Widgets.AppListRow)r;
 
=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2017-02-04 17:18:30 +0000
+++ src/Views/AppListView.vala	2017-02-15 18:04:46 +0000
@@ -22,12 +22,64 @@
 namespace AppCenter.Views {
     /** AppList for Category and Search Views.  Sorts by name and does not show Uninstall Button **/
     public class AppListView : AbstractAppList {
+        private uint current_visible_index = 0U;
+        private GLib.ListStore list_store;
 
         public AppListView () {}
 
+        construct {
+            list_store = new GLib.ListStore (typeof (AppCenterCore.Package));
+            edge_reached.connect ((position) => {
+                if (position == Gtk.PositionType.BOTTOM) {
+                    show_more_apps ();
+                }
+            });
+        }
+
+        public override void add_packages (Gee.Collection<AppCenterCore.Package> packages) {
+            list_store.splice (0, 0, (GLib.Object[]) packages.to_array ());
+            list_store.sort ((GLib.CompareDataFunc<AppCenterCore.Package>) compare_packages);
+            if (current_visible_index < 20) {
+                show_more_apps ();
+            }
+        }
+
+        public override void add_package (AppCenterCore.Package package) {
+            list_store.insert_sorted (package, (GLib.CompareDataFunc<AppCenterCore.Package>) compare_packages);
+            if (current_visible_index < 20) {
+                show_more_apps ();
+            }
+        }
+
+        public override void clear () {
+            base.clear ();
+            list_store.remove_all ();
+            current_visible_index = 0U;
+        }
+
         protected override Widgets.AppListRow make_row (AppCenterCore.Package package)  {
             return (Widgets.AppListRow)(new Widgets.PackageRow.list (package, action_button_group, false));
         }
+
+        // Show 20 more apps on the listbox
+        private void show_more_apps () {
+            uint old_index = current_visible_index;
+            while (current_visible_index < list_store.get_n_items ()) {
+                var package = (AppCenterCore.Package?) list_store.get_object (current_visible_index);
+                var row = make_row (package);
+                set_up_row (row);
+                current_visible_index++;
+                if (old_index + 20 < current_visible_index) {
+                    break;
+                }
+            }
+
+            after_add_remove_change_row ();
+        }
+
+        private static int compare_packages (AppCenterCore.Package p1, AppCenterCore.Package p2) {
+            return p1.get_name ().collate (p2.get_name ());
+        }
     }
 
     /** AppList for the Updates View.  Sorts update_available first and shows headers.
 
=== modified file 'src/Views/CategoryView.vala'
--- src/Views/CategoryView.vala	2016-10-26 12:59:05 +0000
+++ src/Views/CategoryView.vala	2017-02-15 18:04:46 +0000
@@ -96,9 +96,7 @@
 
         unowned Client client = Client.get_default ();
         var apps = client.get_applications_for_category (category);
-        foreach (var app in apps) {
-            app_list_view.add_package (app);
-        }
+        app_list_view.add_packages (apps);
 
     }
 
 
=== modified file 'src/Views/InstalledView.vala'
--- src/Views/InstalledView.vala	2016-09-22 14:10:06 +0000
+++ src/Views/InstalledView.vala	2017-02-15 18:04:46 +0000
@@ -55,9 +55,7 @@
         unowned Client client = Client.get_default ();
 
         var installed_apps = yield client.get_installed_applications ();
-        foreach (var app in installed_apps) {
-            app_list_view.add_package (app);
-        }
+        app_list_view.add_packages (installed_apps);
 
         yield client.get_updates ();
     }
 
=== modified file 'src/Views/SearchView.vala'
--- src/Views/SearchView.vala	2016-10-07 17:58:37 +0000
+++ src/Views/SearchView.vala	2017-02-15 18:04:46 +0000
@@ -21,7 +21,6 @@
 using AppCenterCore;
 
 public class AppCenter.Views.SearchView : View {
-    const int MAX_NUMBER_OF_SEARCH_RESULTS = 100;
     AppListView app_list_view;
 
     public SearchView () {
@@ -46,15 +45,6 @@
         app_list_view.clear ();
         unowned Client client = Client.get_default ();
         var found_apps = client.search_applications (search_term, category);
-        
-        if (found_apps.size > 0) {
-            var apps_array = found_apps.to_array ();
-            int i = 0;
-            while (i < apps_array.length && i < MAX_NUMBER_OF_SEARCH_RESULTS) {
-                var app = apps_array[i];
-                app_list_view.add_package (app);
-                i++;   
-            }
-        }
+        app_list_view.add_packages (found_apps);
     }
 }