Unity 8

Merge lp:~cimi/unity8/card-social into lp:unity8

card-social
Merge into trunk

Proposed by Andrea Cimitan on 2016-03-21

Status:	Merged
Approved by:	Josh Arenson on 2016-04-08
Approved revision:	2134
Merged at revision:	2383
Proposed branch:	lp:~cimi/unity8/card-social
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/valueslider_filter
Diff against target:	1064 lines (+530/-41) 38 files modified plugins/Dash/CardCreator.js (+44/-1) plugins/Dash/CardSocialActions.qml (+94/-0) plugins/Dash/qmldir (+1/-0) qml/Dash/CardGrid.qml (+1/-0) qml/Dash/CardHorizontalList.qml (+1/-0) qml/Dash/CardTool.qml (+23/-7) qml/Dash/CardVerticalJournal.qml (+1/-0) qml/Dash/DashRenderer.qml (+6/-0) qml/Dash/GenericScopeView.qml (+4/-0) tests/mocks/Unity/fake_categories.cpp (+4/-1) tests/mocks/Unity/fake_resultsmodel.cpp (+2/-0) tests/plugins/Dash/cardcreator/1.res (+1/-1) tests/plugins/Dash/cardcreator/1.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/10.res (+1/-1) tests/plugins/Dash/cardcreator/10.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/11.res (+1/-1) tests/plugins/Dash/cardcreator/11.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/12.res (+139/-0) tests/plugins/Dash/cardcreator/12.res.cardcreator (+138/-0) tests/plugins/Dash/cardcreator/12.tst (+3/-0) tests/plugins/Dash/cardcreator/2.res (+1/-1) tests/plugins/Dash/cardcreator/2.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/3.res (+1/-1) tests/plugins/Dash/cardcreator/3.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/4.res (+1/-1) tests/plugins/Dash/cardcreator/4.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/5.res (+1/-1) tests/plugins/Dash/cardcreator/5.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/6.res (+1/-1) tests/plugins/Dash/cardcreator/6.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/7.res (+1/-1) tests/plugins/Dash/cardcreator/7.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/8.res (+1/-1) tests/plugins/Dash/cardcreator/8.res.cardcreator (+1/-1) tests/plugins/Dash/cardcreator/9.res (+1/-1) tests/plugins/Dash/cardcreator/9.res.cardcreator (+1/-1) tests/qmltests/Dash/CardHelpers.js (+9/-7) tests/qmltests/Dash/tst_Card.qml (+38/-3)
To merge this branch:	bzr merge lp:~cimi/unity8/card-social
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Josh Arenson			Approve on 2016-04-08
Unity8 CI Bot	continuous-integration	2016-03-21	Needs Fixing on 2016-04-06
PS Jenkins bot	continuous-integration	2016-03-21	Pending
Albert Astals Cid		2016-03-21	Pending
Review via email: mp+289663@code.launchpad.net

This proposal supersedes a proposal from 2016-03-07.

Commit Message

Add social actions to cards

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
yes
https://code.launchpad.net/~stolowski/unity-scopes-shell/social-attributes/+merge/289164
https://code.launchpad.net/~stolowski/unity-api/social-attributes-role/+merge/289165
* Did you perform an exploratory manual test run of your code change and any related functionality?
will with silo, locally tested with mocks
* Did you make sure that your branch does not contain spurious tags?
y
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
ye
* If you changed the UI, has there been a design review?
y

Albert Astals Cid (aacid) wrote on 2016-02-11: Posted in a previous version of this proposal

columns: width > units.gu(12) ? 4 : 2

where does this units.gu(12) come from?

review: Needs Information

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-11: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2115
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity8/card-social/+merge/285769/+edit-commit-message

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/332/rebuild

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2016-02-11: Posted in a previous version of this proposal

14 gu is a small card in CardTool, minus the 1gu*2 per side.... we want
just small cards to have 4 columns
> Review: Needs Information
>
> columns: width > units.gu(12) ? 4 : 2
>
> where does this units.gu(12) come from?

PS Jenkins bot (ps-jenkins) wrote on 2016-02-11: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7267/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-16: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2116
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity8/card-social/+merge/285769/+edit-commit-message

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/364/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-16: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7302/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-16: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2118
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity8/card-social/+merge/285769/+edit-commit-message

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/365/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-16: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7308/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-22: Posted in a previous version of this proposal

Need commit message and description

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-02: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2119
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity8/card-social/+merge/285769/+edit-commit-message

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/562/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2120
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity8/card-social/+merge/285769/+edit-commit-message

https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/589/
Executed test runs:
    None: https://unity8-jenkins.ubuntu.com/job/lp-generic-update-mp/686/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/782
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/798
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/798

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/589/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/591/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2122
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity8/card-social/+merge/288083/+edit-commit-message

https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/593/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/786
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/802
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/802
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/800/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/800/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/800/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/800/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/800/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/800/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/593/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-05: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/602/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-07: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2127
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/612/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/804
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/820
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/820
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/818/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/818/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/818/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/818/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/818/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/818/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/612/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-07: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2127
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/613/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/805
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/821
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/821
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/819/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/613/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-03-07: Posted in a previous version of this proposal

The social actions won't work in a CardCarousel.

Are we OK with that?

review: Needs Information

Paweł Stołowski (stolowski) wrote on 2016-03-07: Posted in a previous version of this proposal

> The social actions won't work in a CardCarousel.
>
> Are we OK with that?

Should be checked with Patricia I think.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-07: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2128
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/614/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/807
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/823
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/823
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/821/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/821/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/821/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/821/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/821/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/821/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/614/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-03-07: Posted in a previous version of this proposal

The socialActions contents of 12.tst don't look correct, note that that is components and for components the only thing we care about is whether it exists or not and max-count (i.e. CardTool.qml) so it needs fixing to as not to confuse people of what we expect there.

review: Needs Fixing

Andrea Cimitan (cimi) wrote on 2016-03-07: Posted in a previous version of this proposal

> The socialActions contents of 12.tst don't look correct, note that that is
> components and for components the only thing we care about is whether it
> exists or not and max-count (i.e. CardTool.qml) so it needs fixing to as not
> to confuse people of what we expect there.
oops fixed

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-07: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2129
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/615/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/809
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/825
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/825
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/823/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/823/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/823/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/823/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/823/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/823/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/615/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-03-07: Posted in a previous version of this proposal

> > The socialActions contents of 12.tst don't look correct, note that that is
> > components and for components the only thing we care about is whether it
> > exists or not and max-count (i.e. CardTool.qml) so it needs fixing to as not
> > to confuse people of what we expect there.
> oops fixed

I think there's actually the same issue in tests/mocks/Unity/fake_categories.cpp

Albert Astals Cid (aacid) wrote on 2016-03-07: Posted in a previous version of this proposal

> > The social actions won't work in a CardCarousel.
> >
> > Are we OK with that?
>
> Should be checked with Patricia I think.

Seems they don't want them on Carousel, so let's filter them out on the CardTool level and write a console.log if we do the filtering so that scope authors can try to figure out why it doesn't work

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-07: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2130
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/618/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/814
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/830
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/830
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/828/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/828/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/828/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/828/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/828/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/828/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/618/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-03-11: Posted in a previous version of this proposal

var hasSocialActions = hasTitle && components["socialActions"] || false;

needs to be social-actions

actions["max-count"] needs to die as we discussed some days ago

The cardLoader in CardTool needs to be like http://paste.ubuntu.com/15348262/ since now we can't reuse fields for components and cardDAta keys

You can not use

import "../../../qml/Components/ListItems" as ListItems

in CardSocialActions.qml since you get

file:///usr/lib/arm-linux-gnueabihf/unity8/qml/Dash/CardCreator.js:943: Error: Qt.createQmlObject(): failed to create object:
:149:1: Type CardSocialActions unavailable
file:///usr/lib/arm-linux-gnueabihf/unity8/qml/Dash/CardSocialActions.qml:20:1: "../../../qml/Components/ListItems": no such directory

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2016-03-14: Posted in a previous version of this proposal

Text conflict in debian/control
Text conflict in qml/Dash/GenericScopeView.qml
Text conflict in tests/plugins/Dash/cardcreator/9.res.cardcreator
3 conflicts encountered.

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-21: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/779/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-21:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/780/rebuild

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2016-03-23:

1 comment in-line for now. Not 100% done as I can't actually run this yet.

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/857/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-03-30:

Needs https://code.launchpad.net/~aacid/unity8/card-social-category-fix/+merge/290404 too

lp:~cimi/unity8/card-social updated on 2016-04-01

2133. By Andrea Cimitan on 2016-04-01: Fix for review

Andrea Cimitan (cimi) wrote on 2016-04-01:

> 1 comment in-line for now. Not 100% done as I can't actually run this yet.

fixed thanks

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-01:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/913/rebuild

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2016-04-06:

1 inline comment

review: Needs Information

lp:~cimi/unity8/card-social updated on 2016-04-06

2134. By Andrea Cimitan on 2016-04-06: as review

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-06:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/940/rebuild

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2016-04-07:

> 1 inline comment
seems to be fixed now

Josh Arenson (josharenson) wrote on 2016-04-08:

* Did you perform an exploratory manual test run of the code change and any related functionality?
I still can't get it to build locally, but I tested it yesterday (when it worked) with almost the exact same change. Since the change is very small, I'm confident it works.

* Did CI run pass?
No, usual.

* Did you make sure that the branch does not contain spurious tags?
Yes, clean

review: Approve

lp:~cimi/unity8/card-social updated on 2016-05-04

2135. By Andrea Cimitan on 2016-05-04: merged trunk
2136. By Andrea Cimitan on 2016-05-04: fixed card creator test

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andrea Cimitan

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Dash/CardCreator.js'
 --- plugins/Dash/CardCreator.js	2016-03-14 08:41:03 +0000
 +++ plugins/Dash/CardCreator.js	2016-05-04 14:25:47 +0000
@@ -351,6 +351,17 @@
                              model: cardData && cardData["attributes"]; \n\
                            }\n';
++// %1 is used as anchors of socialActionsRow
++// %2 is used as color of socialActionsRow
++var kSocialActionsRowCode = 'CardSocialActions { \n\
++                               id: socialActionsRow; \n\
++                               objectName: "socialActionsRow"; \n\
++                               anchors { %1 } \n\
++                               color: %2; \n\
++                               model: cardData && cardData["socialActions"]; \n\
++                               onClicked: root.action(actionId); \n\
++                             }\n';
++
  // %1 is used as top anchor of summary
  // %2 is used as topMargin anchor of summary
  // %3 is used as color of summary
@@ -437,9 +448,11 @@
      var hasSubtitle = hasTitle && components["subtitle"] || false;
      var hasHeaderRow = hasMascot && hasTitle;
      var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;
++    var hasSocialActions = hasTitle && components["social-actions"] || false;
      var isAudio = template["quick-preview-type"] === "audio";
      var asynchronous = isCardTool ? "false" : "true";
++    code += 'signal action(var actionId);\n';
      if (isAudio) {
          // For now we only support audio cards with [optional] art, title, subtitle
          // in horizontal mode
@@ -841,6 +854,34 @@
          code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);
+     }
++    if (hasSocialActions) {
++        var socialAnchors;
++        var socialTopAnchor;
++
++        if (hasSummary) socialTopAnchor = 'summary.bottom;';
++        else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
++        else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
++        else if (hasHeaderRow) socialTopAnchor = 'row.bottom;';
++        else if (hasTitleContainer) socialTopAnchor = 'headerTitleContainer.bottom;';
++        else if (hasMascot) socialTopAnchor = 'mascotImage.bottom;';
++        else if (hasAttributes) socialTopAnchor = 'attributesRow.bottom;';
++        else if (hasSubtitle) socialTopAnchor = 'subtitleLabel.bottom;';
++        else if (hasTitle) socialTopAnchor = 'titleLabel.bottom;';
++        else if (hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
++        else socialTopAnchor = 'parent.top';
++
++        socialAnchors = 'top: ' + socialTopAnchor + ' left: parent.left; right: parent.right; topMargin: units.gu(1);'
++
++        var socialColor;
++        if (hasBackground) {
++            socialColor = summaryColorWithBackground;
++        } else {
++            socialColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
++        }
++
++        code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
++    }
++
      var touchdownAnchors;
      if (hasBackground) {
          touchdownAnchors = 'fill: backgroundLoader';
@@ -852,7 +893,9 @@
      code += kTouchdownCode.arg(touchdownAnchors);
      var implicitHeight = 'implicitHeight: ';
--    if (hasSummary) {
++    if (hasSocialActions) {
++        implicitHeight += 'socialActionsRow.y + socialActionsRow.height + units.gu(1);\n';
++    } else if (hasSummary) {
          implicitHeight += 'summary.y + summary.height + units.gu(1);\n';
      } else if (isAudio) {
          implicitHeight += 'audioButton.height;\n';
 === added file 'plugins/Dash/CardSocialActions.qml'
 --- plugins/Dash/CardSocialActions.qml	1970-01-01 00:00:00 +0000
 +++ plugins/Dash/CardSocialActions.qml	2016-05-04 14:25:47 +0000
@@ -0,0 +1,94 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import QtQuick.Layouts 1.1
++import Ubuntu.Components 1.3
++
++Column {
++    id: socialActions
++    spacing: units.gu(0.5)
++
++    property alias model: repeater.model
++    property color color: theme.palette.normal.baseText
++
++    signal clicked(var actionId)
++
++    Rectangle {
++        id: divider
++        visible: repeater.count > 0
++        anchors {
++            left: parent.left;
++            right: parent.right;
++            leftMargin:units.dp(1);
++            rightMargin: units.dp(1);
++        }
++        color: Qt.darker(theme.palette.normal.background, 1.12)
++        height: visible ? units.dp(1) : 0
++    }
++
++    Row {
++        id: row
++        anchors {
++            left: parent.left
++            right: parent.right
++            leftMargin: units.gu(1)
++            rightMargin: units.gu(1)
++        }
++        spacing: units.gu(2)
++        readonly property int visibleItems: {
++            if (width <= units.gu(12)) // small card
++                return 2;
++            else if (width <= units.gu(21)) // medium card
++                return 3;
++            else // large or horizontal card
++                return 4;
++        }
++
++        Repeater {
++            id: repeater
++            delegate: Loader {
++                height: units.gu(2)
++                active: index < row.visibleItems
++                sourceComponent: AbstractButton {
++                    objectName: "delegate" + index
++                    height: units.gu(2)
++                    width: icon.width
++                    Icon {
++                        id: icon
++                        objectName: "icon"
++
++                        readonly property url urlIcon: modelData && modelData["icon"] || ""
++                        readonly property url urlTemporaryIcon: "temporaryIcon" in modelData && modelData["temporaryIcon"] || ""
++
++                        height: units.gu(2)
++                        // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
++                        width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
++                        source: urlIcon
++                        color: socialActions.color
++
++                        onUrlIconChanged: {
++                            if (urlIcon) source = urlIcon
++                        }
++                    }
++
++                    onClicked: socialActions.clicked(modelData["id"]);
++                    onPressedChanged: if (pressed && icon.urlTemporaryIcon != "") icon.source = icon.urlTemporaryIcon
++                }
++            }
++        }
++    }
++}
 === modified file 'plugins/Dash/qmldir'
 --- plugins/Dash/qmldir	2015-05-18 22:17:21 +0000
 +++ plugins/Dash/qmldir	2016-05-04 14:25:47 +0000
@@ -5,6 +5,7 @@
  singleton DashAudioPlayer 0.1 DashAudioPlayer.qml
  ScopeStyle 0.1 ScopeStyle.qml
  CardAttributes 0.1 CardAttributes.qml
++CardSocialActions 0.1 CardSocialActions.qml
  CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml
  AudioProgressBar 0.1 AudioProgressBar.qml
  CardAudioProgress 0.1 CardAudioProgress.qml
 === modified file 'qml/Dash/CardGrid.qml'
 --- qml/Dash/CardGrid.qml	2016-02-16 15:09:55 +0000
 +++ qml/Dash/CardGrid.qml	2016-05-04 14:25:47 +0000
@@ -78,6 +78,7 @@
                      target: loader.item
                      onClicked: root.clicked(index, result, loader.item, model)
                      onPressAndHold: root.pressAndHold(index, result, model)
++                    onAction: root.action(index, result, actionId)
+                 }
+             }
+         }
 === modified file 'qml/Dash/CardHorizontalList.qml'
 --- qml/Dash/CardHorizontalList.qml	2016-02-16 15:09:55 +0000
 +++ qml/Dash/CardHorizontalList.qml	2016-05-04 14:25:47 +0000
@@ -59,6 +59,7 @@
                  target: loader.item
                  onClicked: root.clicked(index, result, loader.item, model)
                  onPressAndHold: root.pressAndHold(index, result, model)
++                onAction: root.action(index, result, actionId)
+             }
+         }
+     }
 === modified file 'qml/Dash/CardTool.qml'
 --- qml/Dash/CardTool.qml	2016-02-17 10:51:17 +0000
 +++ qml/Dash/CardTool.qml	2016-05-04 14:25:47 +0000
@@ -162,7 +162,7 @@
          id: attributesModel
          property int numOfAttributes: 0
          property var model: []
--        property bool hasAttributes: {
++        readonly property bool hasAttributes: {
              var attributes = components["attributes"];
              var hasAttributesFlag = (attributes != undefined) && (attributes["field"] != undefined);
@@ -182,16 +182,31 @@
+         }
+     }
++    Item {
++        id: socialActionsModel
++        property var model: []
++        readonly property bool hasActions: components["social-actions"] != undefined
++
++        onHasActionsChanged: {
++            model = []
++            if (hasActions) {
++                model.push( {"id":"text", "icon":"image://theme/ok" } );
++            }
++        }
++    }
++
      Loader {
          id: cardLoader
--        readonly property var fields: ["art", "mascot", "title", "subtitle", "summary", "attributes"]
++        readonly property var cfields: ["art", "mascot", "title", "subtitle", "summary", "attributes", "social-actions"]
++        readonly property var dfields: ["art", "mascot", "title", "subtitle", "summary", "attributes", "socialActions"]
          readonly property var maxData: {
              "art": Qt.resolvedUrl("graphics/pixel.png"),
              "mascot": Qt.resolvedUrl("graphics/pixel.png"),
              "title": "—\n—",
              "subtitle": "—",
              "summary": "—\n—\n—\n—\n—",
--            "attributes": attributesModel.model
++            "attributes": attributesModel.model,
++            "socialActions": socialActionsModel.model
+         }
          sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true);
          onLoaded: {
@@ -206,13 +221,14 @@
+         }
          function updateCardData() {
              var data = {};
--            for (var k in fields) {
--                var component = cardTool.components[fields[k]];
--                var key = fields[k];
++            for (var k in cfields) {
++                var ckey = cfields[k];
++                var component = cardTool.components[ckey];
                  if ((typeof component === "string" && component.length > 0) ||
                      (typeof component === "object" && component !== null
                      && typeof component["field"] === "string" && component["field"].length > 0)) {
--                    data[key] = maxData[key];
++                    var dkey = dfields[k];
++                    data[dkey] = maxData[dkey];
+                 }
+             }
              item.cardData = data;
 === modified file 'qml/Dash/CardVerticalJournal.qml'
 --- qml/Dash/CardVerticalJournal.qml	2016-02-16 15:09:55 +0000
 +++ qml/Dash/CardVerticalJournal.qml	2016-05-04 14:25:47 +0000
@@ -78,6 +78,7 @@
                  target: loader.item
                  onClicked: root.clicked(index, result, loader.item, model)
                  onPressAndHold: root.pressAndHold(index, result, model)
++                onAction: root.action(index, result, actionId)
+             }
+         }
+     }
 === modified file 'qml/Dash/DashRenderer.qml'
 --- qml/Dash/DashRenderer.qml	2015-07-15 15:07:19 +0000
 +++ qml/Dash/DashRenderer.qml	2016-05-04 14:25:47 +0000
@@ -57,4 +57,10 @@
      /// @param result result model of the clicked item, used for activation
      /// @param itemModel model of the item
      signal pressAndHold(int index, var result, var itemModel)
++
++    /// Emitted when the user clicked on an item action
++    /// @param index is the index of the clicked item
++    /// @param result result model of the clicked item, used for activation
++    /// @param actionId id of the clicked action
++    signal action(int index, var result, var actionId)
+ }
 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2016-04-27 15:01:10 +0000
 +++ qml/Dash/GenericScopeView.qml	2016-05-04 14:25:47 +0000
@@ -390,6 +390,10 @@
                          scopeView.itemPressedAndHeld(result, baseItem.category);
+                     }
++                    onAction: { // (int index, var result, var actionId)
++                        scope.activateAction(result, baseItem.categoryId, actionId);
++                    }
++
                      function categoryItemCount() {
                          var categoryItemCount = -1;
                          if (!rendererLoader.expanded && !seeAllLabel.visible && target.collapsedItemCount > 0) {
 === modified file 'tests/mocks/Unity/fake_categories.cpp'
 --- tests/mocks/Unity/fake_categories.cpp	2016-01-14 09:26:28 +0000
 +++ tests/mocks/Unity/fake_categories.cpp	2016-05-04 14:25:47 +0000
@@ -88,7 +88,7 @@
+         }
          case RoleComponents:
+         {
--            QVariantMap map, artMap, attributeMap;
++            QVariantMap map, artMap, attributeMap, socialActionMap;
              if (index.row() % 2 != 0) {
                  artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
              } else {
@@ -99,6 +99,9 @@
              map["title"] = "HOLA";
              map["subtitle"] = "HOLA";
              attributeMap["field"] = "attribute";
++            socialActionMap["icon"] = "icon";
++            socialActionMap["id"] = "socialHola";
++            map["socialActions"] = socialActionMap;
              map["attributes"] = attributeMap;
              return map;
+         }
 === modified file 'tests/mocks/Unity/fake_resultsmodel.cpp'
 --- tests/mocks/Unity/fake_resultsmodel.cpp	2015-11-23 15:41:34 +0000
 +++ tests/mocks/Unity/fake_resultsmodel.cpp	2016-05-04 14:25:47 +0000
@@ -72,6 +72,8 @@
          case RoleUri:
          case RoleCategoryId:
          case RoleDndUri:
++        case RoleAttributes:
++        case RoleSocialActions:
              return QString();
          case RoleResult:
              return QString("Result.%1.%2").arg(m_categoryId).arg(index.row());
 === modified file 'tests/plugins/Dash/cardcreator/1.res'
 --- tests/plugins/Dash/cardcreator/1.res	2016-03-03 12:03:37 +0000
 +++ tests/plugins/Dash/cardcreator/1.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
  Item  {
                              id: artShapeHolder;
 === modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/1.res.cardcreator	2016-03-03 12:03:37 +0000
 +++ tests/plugins/Dash/cardcreator/1.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
  Item  {
                              id: artShapeHolder;
 === modified file 'tests/plugins/Dash/cardcreator/10.res'
 --- tests/plugins/Dash/cardcreator/10.res	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/10.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/10.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/10.res.cardcreator	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/10.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/11.res'
 --- tests/plugins/Dash/cardcreator/11.res	2016-03-03 12:03:37 +0000
 +++ tests/plugins/Dash/cardcreator/11.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/11.res.cardcreator	2016-03-03 12:03:37 +0000
 +++ tests/plugins/Dash/cardcreator/11.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === added file 'tests/plugins/Dash/cardcreator/12.res'
 --- tests/plugins/Dash/cardcreator/12.res	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Dash/cardcreator/12.res	2016-05-04 14:25:47 +0000
@@ -0,0 +1,139 @@
++AbstractButton {
++                id: root;
++                property var cardData;
++                property string artShapeStyle: "inset";
++                property string backgroundShapeStyle: "inset";
++                property real fontScale: 1.0;
++                property var scopeStyle: null;
++                property int fixedHeaderHeight: -1;
++                property size fixedArtShapeSize: Qt.size(-1, -1);
++                readonly property string title: cardData && cardData["title"] || "";
++                property bool showHeader: true;
++                implicitWidth: childrenRect.width;
++                enabled: true;
++signal action(var actionId);
++readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
++Item  {
++                            id: artShapeHolder;
++                            height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;
++                            width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;
++                            anchors { horizontalCenter: parent.horizontalCenter; }
++                            Loader {
++                                id: artShapeLoader;
++                                objectName: "artShapeLoader";
++                                readonly property string cardArt: cardData && cardData["art"] || "";
++                                active: cardArt != "";
++                                asynchronous: true;
++                                visible: status == Loader.Ready;
++                                sourceComponent: Item {
++                                    id: artShape;
++                                    objectName: "artShape";
++                                    visible: image.status == Image.Ready;
++                                    readonly property alias image: artImage;
++                                    Loader {
++                                        anchors.fill: parent;
++                                        visible: true;
++                                        sourceComponent: root.artShapeStyle === "icon" ? artShapeIconComponent : artShapeShapeComponent;
++                                        Component {
++                                            id: artShapeShapeComponent;
++                                            UbuntuShape {
++                                                source: artImage;
++                                                sourceFillMode: UbuntuShape.PreserveAspectCrop;
++                                                radius: "medium";
++                                                aspect: {
++                                                    switch (root.artShapeStyle) {
++                                                        case "inset": return UbuntuShape.Inset;
++                                                        case "shadow": return UbuntuShape.DropShadow;
++                                                        default:
++                                                        case "flat": return UbuntuShape.Flat;
++                                                    }
++                                                }
++                                            }
++                                        }
++                                        Component {
++                                            id: artShapeIconComponent;
++                                            ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
++                                        }
++                                    }
++                                    readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
++                                    readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : 0.75;
++                                    Component.onCompleted: { updateWidthHeightBindings(); }
++                                    Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }
++                                    function updateWidthHeightBindings() {
++                                        if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {
++                                            width = root.fixedArtShapeSize.width;
++                                            height = root.fixedArtShapeSize.height;
++                                        } else {
++                                            width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width });
++                                            height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
++                                        }
++                                    }
++                                    CroppedImageMinimumSourceSize {
++                                        id: artImage;
++                                        objectName: "artImage";
++                                        source: artShapeLoader.cardArt;
++                                        asynchronous: true;
++                                        visible: !true;
++                                        width: root.width;
++                                        height: width / artShape.aspect;
++                                    }
++                                }
++                            }
++                        }
++readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
++Label {
++                        id: titleLabel;
++                        objectName: "titleLabel";
++                        anchors { right: parent.right;
++                        left: parent.left;
++                        top: artShapeHolder.bottom;
++                        topMargin: units.gu(1);
++                        }
++                        elide: Text.ElideRight;
++                        fontSize: "small";
++                        wrapMode: Text.Wrap;
++                        maximumLineCount: 2;
++                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
++                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
++                        visible: showHeader ;
++                        width: undefined;
++                        text: root.title;
++                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
++                        horizontalAlignment: Text.AlignLeft;
++                    }
++Label {
++                            id: subtitleLabel;
++                            objectName: "subtitleLabel";
++                            anchors { left: titleLabel.left;
++                            leftMargin: titleLabel.leftMargin;
++                            right: titleLabel.right;
++                            top: titleLabel.bottom;
++                            }
++                            anchors.topMargin: units.dp(2);
++                            elide: Text.ElideRight;
++                            maximumLineCount: 1;
++                            fontSize: "x-small";
++                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
++                            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
++                            visible: titleLabel.visible && titleLabel.text;
++                            text: cardData && cardData["subtitle"] || "";
++                            font.weight: Font.Light;
++                        }
++CardSocialActions {
++    id: socialActionsRow;
++    objectName: "socialActionsRow";
++    anchors { top: subtitleLabel.bottom; left: parent.left; right: parent.right; topMargin: units.gu(1); }
++    color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
++    model: cardData && cardData["socialActions"];
++    onClicked: root.action(actionId);
++}
++UbuntuShape {
++    id: touchdown;
++    objectName: "touchdown";
++    anchors { fill: artShapeHolder }
++    visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed;
++    radius: "medium";
++    borderSource: "radius_pressed.sci"
++}
++implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
++}
 === added file 'tests/plugins/Dash/cardcreator/12.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/12.res.cardcreator	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Dash/cardcreator/12.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -0,0 +1,138 @@
++AbstractButton {
++                id: root;
++                property var cardData;
++                property string artShapeStyle: "inset";
++                property string backgroundShapeStyle: "inset";
++                property real fontScale: 1.0;
++                property var scopeStyle: null;
++                property size fixedArtShapeSize: Qt.size(-1, -1);
++                readonly property string title: cardData && cardData["title"] || "";
++                property bool showHeader: true;
++                implicitWidth: childrenRect.width;
++                enabled: true;
++signal action(var actionId);
++readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
++Item  {
++                            id: artShapeHolder;
++                            height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;
++                            width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;
++                            anchors { horizontalCenter: parent.horizontalCenter; }
++                            Loader {
++                                id: artShapeLoader;
++                                objectName: "artShapeLoader";
++                                readonly property string cardArt: cardData && cardData["art"] || "";
++                                active: cardArt != "";
++                                asynchronous: false;
++                                visible: status == Loader.Ready;
++                                sourceComponent: Item {
++                                    id: artShape;
++                                    objectName: "artShape";
++                                    visible: image.status == Image.Ready;
++                                    readonly property alias image: artImage;
++                                    Loader {
++                                        anchors.fill: parent;
++                                        visible: true;
++                                        sourceComponent: root.artShapeStyle === "icon" ? artShapeIconComponent : artShapeShapeComponent;
++                                        Component {
++                                            id: artShapeShapeComponent;
++                                            UbuntuShape {
++                                                source: artImage;
++                                                sourceFillMode: UbuntuShape.PreserveAspectCrop;
++                                                radius: "medium";
++                                                aspect: {
++                                                    switch (root.artShapeStyle) {
++                                                        case "inset": return UbuntuShape.Inset;
++                                                        case "shadow": return UbuntuShape.DropShadow;
++                                                        default:
++                                                        case "flat": return UbuntuShape.Flat;
++                                                    }
++                                                }
++                                            }
++                                        }
++                                        Component {
++                                            id: artShapeIconComponent;
++                                            ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
++                                        }
++                                    }
++                                    readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
++                                    readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : 0.75;
++                                    Component.onCompleted: { updateWidthHeightBindings(); }
++                                    Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }
++                                    function updateWidthHeightBindings() {
++                                        if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {
++                                            width = root.fixedArtShapeSize.width;
++                                            height = root.fixedArtShapeSize.height;
++                                        } else {
++                                            width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width });
++                                            height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
++                                        }
++                                    }
++                                    CroppedImageMinimumSourceSize {
++                                        id: artImage;
++                                        objectName: "artImage";
++                                        source: artShapeLoader.cardArt;
++                                        asynchronous: false;
++                                        visible: !true;
++                                        width: root.width;
++                                        height: width / artShape.aspect;
++                                    }
++                                }
++                            }
++                        }
++readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
++Label {
++                        id: titleLabel;
++                        objectName: "titleLabel";
++                        anchors { right: parent.right;
++                        left: parent.left;
++                        top: artShapeHolder.bottom;
++                        topMargin: units.gu(1);
++                        }
++                        elide: Text.ElideRight;
++                        fontSize: "small";
++                        wrapMode: Text.Wrap;
++                        maximumLineCount: 2;
++                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
++                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
++                        visible: showHeader ;
++                        width: undefined;
++                        text: root.title;
++                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
++                        horizontalAlignment: Text.AlignLeft;
++                    }
++Label {
++                            id: subtitleLabel;
++                            objectName: "subtitleLabel";
++                            anchors { left: titleLabel.left;
++                            leftMargin: titleLabel.leftMargin;
++                            right: titleLabel.right;
++                            top: titleLabel.bottom;
++                            }
++                            anchors.topMargin: units.dp(2);
++                            elide: Text.ElideRight;
++                            maximumLineCount: 1;
++                            fontSize: "x-small";
++                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
++                            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
++                            visible: titleLabel.visible && titleLabel.text;
++                            text: cardData && cardData["subtitle"] || "";
++                            font.weight: Font.Light;
++                        }
++CardSocialActions {
++    id: socialActionsRow;
++    objectName: "socialActionsRow";
++    anchors { top: subtitleLabel.bottom; left: parent.left; right: parent.right; topMargin: units.gu(1); }
++    color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
++    model: cardData && cardData["socialActions"];
++    onClicked: root.action(actionId);
++}
++UbuntuShape {
++    id: touchdown;
++    objectName: "touchdown";
++    anchors { fill: artShapeHolder }
++    visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed;
++    radius: "medium";
++    borderSource: "radius_pressed.sci"
++}
++implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
++}
 === added file 'tests/plugins/Dash/cardcreator/12.tst'
 --- tests/plugins/Dash/cardcreator/12.tst	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Dash/cardcreator/12.tst	2016-05-04 14:25:47 +0000
@@ -0,0 +1,3 @@
++template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
++components: {"art":{"aspect-ratio":0.75,"field":"art"},"subtitle":{"field":"price"},"title":{"field":"title"},"attributes":{},"social-actions":{}}
++result: 12.res
 === modified file 'tests/plugins/Dash/cardcreator/2.res'
 --- tests/plugins/Dash/cardcreator/2.res	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/2.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/2.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/2.res.cardcreator	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/2.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/3.res'
 --- tests/plugins/Dash/cardcreator/3.res	2016-03-03 12:03:37 +0000
 +++ tests/plugins/Dash/cardcreator/3.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
  Item  {
                              id: artShapeHolder;
 === modified file 'tests/plugins/Dash/cardcreator/3.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/3.res.cardcreator	2016-03-03 12:03:37 +0000
 +++ tests/plugins/Dash/cardcreator/3.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
  Item  {
                              id: artShapeHolder;
 === modified file 'tests/plugins/Dash/cardcreator/4.res'
 --- tests/plugins/Dash/cardcreator/4.res	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/4.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  readonly property size artShapeSize: Qt.size(-1, -1);
  readonly property int headerHeight: row.height;
  Row {
 === modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/4.res.cardcreator	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/4.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  readonly property size artShapeSize: Qt.size(-1, -1);
  readonly property int headerHeight: row.height;
  Row {
 === modified file 'tests/plugins/Dash/cardcreator/5.res'
 --- tests/plugins/Dash/cardcreator/5.res	2016-03-03 12:03:37 +0000
 +++ tests/plugins/Dash/cardcreator/5.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: false;
--
++signal action(var actionId);
  readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
  Item  {
                              id: artShapeHolder;
 === modified file 'tests/plugins/Dash/cardcreator/5.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/5.res.cardcreator	2016-03-03 12:03:37 +0000
 +++ tests/plugins/Dash/cardcreator/5.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: false;
--
++signal action(var actionId);
  readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
  Item  {
                              id: artShapeHolder;
 === modified file 'tests/plugins/Dash/cardcreator/6.res'
 --- tests/plugins/Dash/cardcreator/6.res	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/6.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/6.res.cardcreator	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/6.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/7.res'
 --- tests/plugins/Dash/cardcreator/7.res	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/7.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/7.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/7.res.cardcreator	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/7.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/8.res'
 --- tests/plugins/Dash/cardcreator/8.res	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/8.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/8.res.cardcreator	2016-02-17 10:51:17 +0000
 +++ tests/plugins/Dash/cardcreator/8.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  Loader {
                                  id: backgroundLoader;
                                  objectName: "backgroundLoader";
 === modified file 'tests/plugins/Dash/cardcreator/9.res'
 --- tests/plugins/Dash/cardcreator/9.res	2016-03-10 16:53:04 +0000
 +++ tests/plugins/Dash/cardcreator/9.res	2016-05-04 14:25:47 +0000
@@ -11,7 +11,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  readonly property size artShapeSize: Qt.size(-1, -1);
  readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;
  Label {
 === modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
 --- tests/plugins/Dash/cardcreator/9.res.cardcreator	2016-03-10 16:53:04 +0000
 +++ tests/plugins/Dash/cardcreator/9.res.cardcreator	2016-05-04 14:25:47 +0000
@@ -10,7 +10,7 @@
                  property bool showHeader: true;
                  implicitWidth: childrenRect.width;
                  enabled: true;
--
++signal action(var actionId);
  readonly property size artShapeSize: Qt.size(-1, -1);
  readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;
  Label {
 === modified file 'tests/qmltests/Dash/CardHelpers.js'
 --- tests/qmltests/Dash/CardHelpers.js	2015-05-15 12:57:48 +0000
 +++ tests/qmltests/Dash/CardHelpers.js	2016-05-04 14:25:47 +0000
@@ -16,7 +16,8 @@
  .pragma library
--var components = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "overlayColor", "quickPreviewData"]
++var components = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "social-actions", "overlayColor", "quickPreviewData"]
++var dataKeys = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "socialActions", "overlayColor", "quickPreviewData"]
  var defaultLayout = ' \
  { \
@@ -38,7 +39,8 @@
      "mascot": null, \
      "emblem": null, \
      "summary": null, \
--    "attributes": { "max-count": 2 } \
++    "attributes": { "max-count": 2 }, \
++    "social-actions": null \
    }, \
    "resources": {} \
  }'
@@ -52,10 +54,10 @@
    "emblem": "emblem", \
    "overlayColor": "overlayColor", \
    "summary": "summary", \
--  "attributes": "attributes" \
++  "attributes": "attributes", \
++  "social-actions": "socialActions" \
  }'
--
  function tryParse(json, errorLabel) {
      var o = undefined;
      if (errorLabel !== undefined) {
@@ -82,12 +84,12 @@
          for (var k in components) {
              try {
                  if (typeof layout[components[k]] == "object") {
--                    d[components[k]] = o[layout[components[k]]['field']];
++                    d[dataKeys[k]] = o[layout[components[k]]['field']];
                  } else {
--                    d[components[k]] = o[layout[components[k]]];
++                    d[dataKeys[k]] = o[layout[components[k]]];
+                 }
              } catch(err) {
--                d[components[k]] = undefined;
++                d[dataKeys[k]] = undefined;
+             }
+         }
+     }
 === modified file 'tests/qmltests/Dash/tst_Card.qml'
 --- tests/qmltests/Dash/tst_Card.qml	2016-04-13 08:16:05 +0000
 +++ tests/qmltests/Dash/tst_Card.qml	2016-05-04 14:25:47 +0000
@@ -36,6 +36,10 @@
        "subtitle": "bar",
        "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
        "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}],
++      "socialActions": [{"id":"like","icon":"image://theme/ok","temporaryIcon":"image://theme/undo"},
++                        {"id":"share","icon":"image://theme/cancel"},
++                        {"id":"like","icon":"image://theme/ok","temporaryIcon":"image://theme/undo"},
++                        {"id":"share","icon":"image://theme/cancel"}],
        "quickPreviewData": {"uri": "/some/file", "duration": "14"}
      }'
@@ -211,6 +215,11 @@
+         }
+     }
++    SignalSpy {
++        id: signalSpy
++        signalName: "action"
++    }
++
      UT.UnityTestCase {
          id: testCase
          name: "Card"
@@ -274,9 +283,11 @@
                  { tag: "Wide", width: units.gu(18), index: 0 },
                  { tag: "Horizontal", width: units.gu(38), index: 5 },
                  // Make sure card ends with header when there's no summary
--                { tag: "NoSummary", height: function() { var cardToolRow = findChild(cardTool, "outerRow");
--                                                         return cardToolRow.y + cardToolRow.height + units.gu(1) }, index: 6 },
--                { tag: "HorizontalNoSummary", height: function() { return headerRow.height + units.gu(2) }, card_layout: "horizontal", index: 6 },
++                { tag: "NoSummary", height: function() { var socialActionsRow = findChild(cardTool, "socialActionsRow");
++                                                         return socialActionsRow.y + socialActionsRow.height + units.gu(1) }, index: 6 },
++                { tag: "HorizontalNoSummary", height: function() { var socialActionsRow = findChild(cardTool, "socialActionsRow");
++                                                                   return socialActionsRow.y + socialActionsRow.height + units.gu(1) },
++                                              card_layout: "horizontal", index: 6 },
+             ]
+         }
@@ -641,5 +652,29 @@
                  verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));
+             }
+         }
++
++        function test_action() {
++            selector.selectedIndex = 0;
++            waitForRendering(card);
++
++            signalSpy.target = card;
++            var socialActionsRow = findChild(card, "socialActionsRow");
++            var delegate0 = findChild(socialActionsRow, "delegate0");
++            var icon0 = findChild(delegate0, "icon");
++            var delegate1 = findChild(socialActionsRow, "delegate1");
++            var icon1 = findChild(delegate1, "icon");
++
++            compare(icon0.source, "image://theme/ok");
++            mouseClick(delegate0, delegate0.height / 2, delegate0.height / 2);
++            tryCompare(signalSpy, "count", 1);
++            compare(signalSpy.signalArguments[0][0], "like");
++            compare(icon0.source, "image://theme/undo");
++
++            compare(icon1.source, "image://theme/cancel");
++            mouseClick(delegate1, delegate1.height / 2, delegate1.height / 2);
++            tryCompare(signalSpy, "count", 2);
++            compare(signalSpy.signalArguments[1][0], "share");
++            compare(icon1.source, "image://theme/cancel");
++        }
+     }
+ }