Merge lp:~donadigo/appcenter/ui-margins into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

* Add margin to updated grid
* Do not load screenshots if there are none

Bitesize branch which fixes the updated grid margins and if there are no screenshots immedietaly displays that in the UI.

[Danielle Foré (danrabbit)]

works for me

review: Approve

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:appcenter failed due to conflicts:

text conflict in src/Views/AppInfoView.vala

[lp:~donadigo/appcenter/ui-margins]

286. By Adam Bieńkowski on 2016-09-02

Add margin to updated grid; do not load screenshots if there are none

=== modified file 'src/Views/AppInfoView.vala'
--- src/Views/AppInfoView.vala	2016-09-01 09:08:12 +0000
+++ src/Views/AppInfoView.vala	2016-09-02 18:27:32 +0000
@@ -161,9 +161,17 @@
 
         public void load_more_content () {
             new Thread<void*> ("content-loading", () => {
+                app_version.label = package.get_version ();
+
                 string url = null;
                 uint max_size = 0U;
-                package.component.get_screenshots ().foreach ((screenshot) => {
+                var screenshots = package.component.get_screenshots ();
+                if (screenshots.length == 0) {
+                    screenshot_stack.visible_child = app_screenshot_not_found;
+                    return null;
+                }
+
+                screenshots.foreach ((screenshot) => {
                     screenshot.get_images ().foreach ((image) => {
                         if (max_size < image.get_width ()) {
                             url = image.get_url ();
@@ -176,8 +184,6 @@
                     set_screenshot (url);
                 }
 
-                app_version.label = package.get_version ();
-
                 return null;
             });
         }
@@ -232,4 +238,4 @@
             }
         }
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2016-09-01 09:08:12 +0000
+++ src/Views/AppListView.vala	2016-09-02 18:27:32 +0000
@@ -151,6 +151,7 @@
         var updated_grid = new Gtk.Grid ();
         updated_grid.orientation = Gtk.Orientation.HORIZONTAL;
         updated_grid.column_spacing = 12;
+        updated_grid.margin = 6;
         if (updating_cache) {
             updated_grid.halign = Gtk.Align.CENTER;
             var updating_label = new Gtk.Label (_("Searching for updates…"));