Merge lp:~jindallo/today-scope/convergence-ui-support into lp:today-scope

[Jin]

[lp:~jindallo/today-scope/convergence-ui-support]

97. By Jin on 2016-07-19

Library rebased to 4.9 for Today aggregator

[Kyle Nitzsche (knitzsche)]

Hi Jin,

Please note today trunk is now at 4.11 release.

I assume you tested this on tablet landscape & portrait and something small like the Krillin.

Instead of:
* "_category_title": "Upcoming Holidays"
Can you consider "_category_title": "Holidays"

Because Holidays is already translated and seems good in this context.

[Kyle Nitzsche (knitzsche)]

Hi Jin,

On the Recent category, I think you should probably revert to collapsed-rows of 0. 0 means display ALL results. We don't want to collapse here. We want to show all three results (one from calls, one from texts, and one from telegram), unless the user doesn't have them or has disabled them.

So I don't think the cardinality needs to change for Recent either.

[Kyle Nitzsche (knitzsche)]

Thanks Jin!

review: Needs Fixing

[lp:~jindallo/today-scope/convergence-ui-support]

98. By Jin on 2016-07-29

Code review patch - 01

[Jin (jindallo)]

Hello Kyle,

Please have a look,
what you mentioned make sense to me,
already patched as r.98.

[Kyle Nitzsche (knitzsche)]

Thanks Jin. LGTM

review: Approve

=== modified file 'click-src/aggregator/child_scopes.json'
--- click-src/aggregator/child_scopes.json	2016-03-09 14:45:03 +0000
+++ click-src/aggregator/child_scopes.json	2016-07-29 07:47:09 +0000
@@ -81,7 +81,7 @@
         {
             "scope": {
                 "_category_title": "Weather",
-                "cardinality": 3,
+                "cardinality": 10,
                 "id": "com.canonical.scopes.weatherchannel",
                 "local_id": "weather_channel_localId",
                 "renderer": {
@@ -94,16 +94,16 @@
                     "template": {
                         "card-layout": "vertical",
                         "card-size": "small",
-                        "category-layout": "grid"
+                        "category-layout": "grid",
+                        "collapsed-rows": 1
                     }
                 }
             }
         },
         {
             "scope": {
-                "_category_title": "Next Holiday",
-                "child_category": "left",
-                "child_category_max_results": 1,
+                "_category_title": "Holidays",
+                "cardinality": 10,
                 "id": "com.canonical.scopes.holidays_holidays",
                 "local_id": "holidays_localID",
                 "renderer": {
@@ -113,9 +113,10 @@
                     },
                     "schema-version": 1,
                     "template": {
-                        "card-layout": "horizontal",
-                        "card-size": "small",
-                        "category-layout": "vertical-journal"
+                        "card-layout": "vertical",
+                        "card-size": "medium",
+                        "category-layout": "grid",
+                        "collapsed-rows": 1
                     }
                 }
             }
@@ -123,19 +124,45 @@
         {
             "scope": {
                 "category_title_use_incoming": "true",
-                "child_category": "Events today",
+                "cardinality": 10,
                 "id": "com.canonical.scopes.events_events",
                 "local_id": "events_localID",
-                "max_child_category_results": 3
+                "renderer": {
+                    "components": {
+                        "art": "art",
+                        "subtitle": "subtitle",
+                        "title": "title"
+                    },
+                    "schema-version": 1,
+                    "template": {
+                        "card-layout": "horizontal",
+                        "card-size": "small",
+                        "category-layout": "grid",
+                        "collapsed-rows": 1
+                    }
+                }
             }
         },
         {
             "scope": {
                 "category_title_use_incoming": "true",
-                "child_category": "Tasks due today",
+                "cardinality": 10,
                 "id": "com.canonical.scopes.tasks_sctasks",
                 "local_id": "tasks_localID",
-                "max_child_category_results": 1
+                "renderer": {
+                    "components": {
+                        "art": "art",
+                        "subtitle": "subtitle",
+                        "title": "title"
+                    },
+                    "schema-version": 1,
+                    "template": {
+                        "card-layout": "horizontal",
+                        "card-size": "small",
+                        "category-layout": "grid",
+                        "collapsed-rows": 1
+                    }
+                }
             }
         },
         {
@@ -194,7 +221,7 @@
         {
             "scope": {
                 "_category_title": "My Activity",
-                "cardinality": 3,
+                "cardinality": 10,
                 "id": "com.canonical.scopes.fitbit_fitbit",
                 "local_id": "fitbit_localId",
                 "renderer": {
@@ -206,7 +233,8 @@
                     "schema-version": 1,
                     "template": {
                         "card-size": "small",
-                        "category-layout": "grid"
+                        "category-layout": "grid",
+                        "collapsed-rows": 1
                     }
                 },
                 "result_category_id_to_common_template": [

=== renamed file 'click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so' => 'click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so.OTHER' (properties changed: +x to -x)
Binary files click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so	2016-07-13 15:27:21 +0000 and click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so.OTHER	2016-07-29 07:47:09 +0000 differ