Merge lp:~alecu/unity-scope-click/super-stilish-scopes into lp:unity-scope-click/devel

[Alejandro J. Cura]

Change the renderer for categories with just scopes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:418
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/282/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/256
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/256/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/256

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/282/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

Some of the scope icons don't look so great, but that seems to be a result of scaling/cropping in unity8 rather than an issue in this branch.

review: Approve

[Alejandro J. Cura (alecu)]

Here's how it looks when looking at the "Developer Tools" department in staging: http://pasteboard.co/2tNPTLdY.png

=== modified file 'libclickscope/click/highlights.cpp'
--- libclickscope/click/highlights.cpp	2014-08-05 19:00:03 +0000
+++ libclickscope/click/highlights.cpp	2014-08-21 21:18:09 +0000
@@ -39,10 +39,11 @@
 {
 }
 
-Highlight::Highlight(const std::string& slug, const std::string& name, const Packages& pkgs)
+Highlight::Highlight(const std::string& slug, const std::string& name, const Packages& pkgs, bool contains_scopes)
     : slug_(slug),
       name_(name),
-      packages_(pkgs)
+      packages_(pkgs),
+      contains_scopes_(contains_scopes)
 {
 }
 
@@ -51,6 +52,11 @@
     packages_.push_back(pkg);
 }
 
+bool Highlight::contains_scopes() const
+{
+    return contains_scopes_;
+}
+
 std::string Highlight::slug() const
 {
     return slug_;
@@ -116,7 +122,7 @@
                 highlights.push_back(Highlight("__all-apps__", _("Apps"), apps));
             }
             if (scopes.size() > 0) {
-                highlights.push_back(Highlight("__all-scopes__", _("Scopes"), scopes));
+                highlights.push_back(Highlight("__all-scopes__", _("Scopes"), scopes, true));
             }
         }
     }

=== modified file 'libclickscope/click/highlights.h'
--- libclickscope/click/highlights.h	2014-07-10 10:11:04 +0000
+++ libclickscope/click/highlights.h	2014-08-21 21:18:09 +0000
@@ -51,12 +51,13 @@
     };
 
     Highlight(const std::string& name);
-    Highlight(const std::string& slug, const std::string& name, const Packages& pkgs);
+    Highlight(const std::string& slug, const std::string& name, const Packages& pkgs, bool contains_scopes=false);
     void add_package(const Package& pkg);
 
     std::string name() const;
     std::string slug() const;
     Packages packages() const;
+    bool contains_scopes() const;
 
     static std::list<Highlight> from_json_root_node(const Json::Value& val);
 
@@ -66,6 +67,7 @@
     std::string slug_;
     std::string name_;
     Packages packages_;
+    bool contains_scopes_;
 };
 
 typedef std::list<Highlight> HighlightList;

=== modified file 'libclickscope/tests/test_bootstrap.cpp'
--- libclickscope/tests/test_bootstrap.cpp	2014-08-05 19:00:03 +0000
+++ libclickscope/tests/test_bootstrap.cpp	2014-08-21 21:18:09 +0000
@@ -184,18 +184,23 @@
         auto it = highlights.begin();
         EXPECT_EQ("Top Apps", it->name());
         EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
         ++it;
         EXPECT_EQ("Most Purchased", it->name());
         EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
         ++it;
         EXPECT_EQ("New Releases", it->name());
         EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
         ++it;
         EXPECT_EQ("Apps", it->name());
         EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
         ++it;
         EXPECT_EQ("Scopes", it->name());
         EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(true, it->contains_scopes());
     }
 
 }

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-08-20 16:56:36 +0000
+++ scope/clickstore/store-query.cpp	2014-08-21 21:18:09 +0000
@@ -77,6 +77,25 @@
     }
 )";
 
+static const std::string CATEGORY_SCOPES_DISPLAY = R"(
+    {
+        "schema-version" : 1,
+        "template" : {
+            "overlay": true,
+            "category-layout" : "grid",
+            "card-size": "small"
+        },
+        "components" : {
+            "title" : "title",
+            "subtitle": "subtitle",
+            "art" : {
+                "field": "art",
+                "aspect-ratio": 0.55
+            }
+        }
+    }
+)";
+
 static const std::string CATEGORY_APP_OF_THE_WEEK = R"(
 {
     "schema-version" : 1,
@@ -322,6 +341,7 @@
 void click::Query::push_highlights(const scopes::SearchReplyProxy& searchReply, const HighlightList& highlights, const PackageSet &locallyInstalledApps)
 {
     const scopes::CategoryRenderer renderer(CATEGORY_APPS_DISPLAY);
+    const scopes::CategoryRenderer scopes_renderer(CATEGORY_SCOPES_DISPLAY);
     const scopes::CategoryRenderer aotw_renderer(CATEGORY_APP_OF_THE_WEEK);
 
     for (auto const& hl: highlights)
@@ -331,6 +351,10 @@
         {
             rdr = &aotw_renderer;
         }
+        if (hl.contains_scopes())
+        {
+            rdr = &scopes_renderer;
+        }
         auto category = register_category(searchReply, hl.slug(), hl.name(), "", *rdr);
         for (auto const& pkg: hl.packages())
         {