Unity 8

Merge lp:~diegosarmentero/unity8/publisher-info into lp:unity8

  1. publisher-info
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Rejected
Rejected by: Michael Zanetti
Proposed branch: lp:~diegosarmentero/unity8/publisher-info
Merge into: lp:unity8
Diff against target: 130 lines (+36/-6)
3 files modified
Dash/Apps/AppInfo.qml (+18/-2)
Dash/Apps/AppPreview.qml (+6/-3)
tests/qmltests/Dash/Apps/tst_AppPreview.qml (+12/-1)
To merge this branch: bzr merge lp:~diegosarmentero/unity8/publisher-info
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Disapprove
PS Jenkins bot (community) continuous-integration Needs Fixing
dobey (community) Approve
Review via email: mp+188352@code.launchpad.net

Commit message

- Add publisher information to App Preview.
- Disable Rates stars because they are not interactive yet, and we are not using the service.

Without Publisher information: http://ubuntuone.com/6uRD60aMxwvWMnah9rL79q
With Publisher information: http://ubuntuone.com/6KU0lJm0GK4eSnSXThQR5j

To post a comment you must log in.
lp:~diegosarmentero/unity8/publisher-info updated
364. By Diego Sarmentero

removing rating stars

365. By Diego Sarmentero

tests fixed

Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:363
http://jenkins.qa.ubuntu.com/job/unity8-ci/1170/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4188
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1855
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1170
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1169
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/56
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1857
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1857/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1553
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1565

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:365
http://jenkins.qa.ubuntu.com/job/unity8-ci/1178/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1178
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1177
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/79
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1881
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1881/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1577
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1590

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

This will badly conflict with https://code.launchpad.net/~unity-team/unity8/fix-genericpreview/+merge/188355

I will take the changes from this branch and integrate them into the other.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

Ok, integrated those changes into the new branch. Diego, please give it a look:

https://code.launchpad.net/~unity-team/unity8/fix-genericpreview/+merge/188355

It's revision 372.

review: Disapprove

Unmerged revisions

365. By Diego Sarmentero

tests fixed

364. By Diego Sarmentero

removing rating stars

363. By Diego Sarmentero

link bug

362. By Diego Sarmentero

adding publisher information to the app preview

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Dash/Apps/AppInfo.qml'
--- Dash/Apps/AppInfo.qml 2013-08-16 15:54:47 +0000
+++ Dash/Apps/AppInfo.qml 2013-09-30 15:42:38 +0000
@@ -22,6 +22,7 @@
22 id: root22 id: root
23 property alias icon: image.source23 property alias icon: image.source
24 property alias appName: appNameLabel.text24 property alias appName: appNameLabel.text
25 property alias publisher: publisherNameLabel.text
25 property alias rating: ratingStars.rating26 property alias rating: ratingStars.rating
26 property int rated: 027 property int rated: 0
27 property int reviews: 028 property int reviews: 0
@@ -30,8 +31,8 @@
3031
31 UbuntuShape {32 UbuntuShape {
32 id: imageShape33 id: imageShape
33 width: units.gu(6)34 width: colInfo.childrenRect.height < (root.width - rowStars.width - colInfo.spacing) ? colInfo.childrenRect.height : units.gu(10)
34 height: units.gu(6)35 height: colInfo.childrenRect.height < (root.width - rowStars.width - colInfo.spacing) ? colInfo.childrenRect.height : units.gu(10)
35 image: Image {36 image: Image {
36 id: image37 id: image
37 sourceSize { width: imageShape.width; height: imageShape.height }38 sourceSize { width: imageShape.width; height: imageShape.height }
@@ -52,6 +53,21 @@
52 opacity: .953 opacity: .9
53 }54 }
5455
56 Label {
57 id: publisherNameLabel
58 visible: publisherNameLabel.text.length > 0 ? true : false
59 fontSize: "medium"
60 color: "white"
61 style: Text.Raised
62 styleColor: "black"
63 opacity: .9
64 anchors {
65 left: parent.left
66 right: parent.right
67 }
68 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
69 }
70
55 Row {71 Row {
56 visible: root.rating >= 072 visible: root.rating >= 0
57 spacing: units.gu(1)73 spacing: units.gu(1)
5874
=== modified file 'Dash/Apps/AppPreview.qml'
--- Dash/Apps/AppPreview.qml 2013-09-26 18:55:06 +0000
+++ Dash/Apps/AppPreview.qml 2013-09-30 15:42:38 +0000
@@ -140,6 +140,7 @@
140 anchors { left: parent.left; right: parent.right }140 anchors { left: parent.left; right: parent.right }
141141
142 appName: root.previewData.title142 appName: root.previewData.title
143 publisher: root.previewData.infoMap["publisher"] ? root.previewData.infoMap["publisher"].value : ""
143 icon: root.previewData.appIcon144 icon: root.previewData.appIcon
144 rating: Math.round(root.previewData.rating * 10)145 rating: Math.round(root.previewData.rating * 10)
145 reviews: root.previewData.numRatings146 reviews: root.previewData.numRatings
@@ -158,7 +159,11 @@
158 }159 }
159160
160 Column {161 Column {
161 visible: root.previewData.rating >= 0162 id: columnReviewRating
163 objectName: "columnReviewRating"
164 // TODO: This should make this visible when the feature for reviews/comments is complete.
165 // This should be enabled when the feature is complete: visible: root.previewData.rating >= 0
166 visible: false
162 anchors { left: parent.left; right: parent.right }167 anchors { left: parent.left; right: parent.right }
163 spacing: parent.spacing168 spacing: parent.spacing
164169
@@ -193,8 +198,6 @@
193 AppReviews {198 AppReviews {
194 id: appReviews199 id: appReviews
195 objectName: "appReviews"200 objectName: "appReviews"
196 // TODO: This should make this visible when the feature for reviews/comments is complete.
197 visible: false
198 anchors { left: parent.left; right: parent.right }201 anchors { left: parent.left; right: parent.right }
199202
200 model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined203 model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined
201204
=== modified file 'tests/qmltests/Dash/Apps/tst_AppPreview.qml'
--- tests/qmltests/Dash/Apps/tst_AppPreview.qml 2013-09-26 18:55:06 +0000
+++ tests/qmltests/Dash/Apps/tst_AppPreview.qml 2013-09-30 15:42:38 +0000
@@ -42,6 +42,7 @@
42 QtObject { id: rated; property int value: 120 }42 QtObject { id: rated; property int value: 120 }
43 QtObject { id: reviews; property int value: 8 }43 QtObject { id: reviews; property int value: 8 }
44 QtObject { id: progress; property string value: "source" }44 QtObject { id: progress; property string value: "source" }
45 QtObject { id: publisher; property string value: "Ubuntu Developer" }
45 QtObject { id: comments; property var value: [46 QtObject { id: comments; property var value: [
46 ["Unity User", 4, "08/20/2013", root.commentary],47 ["Unity User", 4, "08/20/2013", root.commentary],
47 ["Unity User", 8, "01/15/2013", root.commentary],48 ["Unity User", 8, "01/15/2013", root.commentary],
@@ -62,7 +63,8 @@
62 property var infoMap: {63 property var infoMap: {
63 "more-screenshots": screenshots,64 "more-screenshots": screenshots,
64 "rated": rated,65 "rated": rated,
65 "comments": comments66 "comments": comments,
67 "publisher": publisher
66 }68 }
67 property var actions: [69 property var actions: [
68 { "id": 123, "displayName": "action1" },70 { "id": 123, "displayName": "action1" },
@@ -84,6 +86,7 @@
84 "more-screenshots": screenshots,86 "more-screenshots": screenshots,
85 "rated": rated,87 "rated": rated,
86 "comments": comments,88 "comments": comments,
89 "publisher": publisher,
87 "progressbar_source": progressSource90 "progressbar_source": progressSource
88 }91 }
89 property var actions: [92 property var actions: [
@@ -137,6 +140,12 @@
137 }140 }
138 }141 }
139142
143 function test_check_app_info() {
144 var appInfo = findChild(appPreview, "appInfo");
145 compare(appInfo.appName, data.title, "App Title doesn't match.");
146 compare(appInfo.publisher, publisher.value, "Publisher name doesn't match.");
147 }
148
140 function test_rated() {149 function test_rated() {
141 var rated = findChild(appPreview, "ratedLabel");150 var rated = findChild(appPreview, "ratedLabel");
142 compare(rated.text, "(120)", "Rates not equal");151 compare(rated.text, "(120)", "Rates not equal");
@@ -154,6 +163,8 @@
154 }163 }
155164
156 function test_review_focus() {165 function test_review_focus() {
166 var columnReviewRating = findChild(appPreview, "columnReviewRating");
167 columnReviewRating.visible = true;
157 var appReviews = findChild(appPreview, "appReviews");168 var appReviews = findChild(appPreview, "appReviews");
158 appReviews.visible = true;169 appReviews.visible = true;
159 var sendButton = findChild(appReviews, "sendButton");170 var sendButton = findChild(appReviews, "sendButton");

Subscribers

People subscribed via source and target branches