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

[Diego Sarmentero]

- 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

[lp:~diegosarmentero/unity8/publisher-info]

364. By Diego Sarmentero on 2013-09-30

removing rating stars

365. By Diego Sarmentero on 2013-09-30

tests fixed

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Michael Zanetti (mzanetti)]

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.

[Michael Zanetti (mzanetti)]

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 on 2013-09-30

tests fixed

364. By Diego Sarmentero on 2013-09-30

removing rating stars

363. By Diego Sarmentero on 2013-09-30

link bug

362. By Diego Sarmentero on 2013-09-30

adding publisher information to the app preview

=== 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 @@
     id: root
     property alias icon: image.source
     property alias appName: appNameLabel.text
+    property alias publisher: publisherNameLabel.text
     property alias rating: ratingStars.rating
     property int rated: 0
     property int reviews: 0
@@ -30,8 +31,8 @@
 
     UbuntuShape {
         id: imageShape
-        width: units.gu(6)
-        height: units.gu(6)
+        width: colInfo.childrenRect.height < (root.width - rowStars.width - colInfo.spacing) ? colInfo.childrenRect.height : units.gu(10)
+        height: colInfo.childrenRect.height < (root.width - rowStars.width - colInfo.spacing) ? colInfo.childrenRect.height : units.gu(10)
         image: Image {
             id: image
             sourceSize { width: imageShape.width; height: imageShape.height }
@@ -52,6 +53,21 @@
             opacity: .9
         }
 
+        Label {
+            id: publisherNameLabel
+            visible: publisherNameLabel.text.length > 0 ? true : false
+            fontSize: "medium"
+            color: "white"
+            style: Text.Raised
+            styleColor: "black"
+            opacity: .9
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        }
+
         Row {
             visible: root.rating >= 0
             spacing: units.gu(1)

=== 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 @@
             anchors { left: parent.left; right: parent.right }
 
             appName: root.previewData.title
+            publisher: root.previewData.infoMap["publisher"] ? root.previewData.infoMap["publisher"].value : ""
             icon: root.previewData.appIcon
             rating: Math.round(root.previewData.rating * 10)
             reviews: root.previewData.numRatings
@@ -158,7 +159,11 @@
         }
 
         Column {
-            visible: root.previewData.rating >= 0
+            id: columnReviewRating
+            objectName: "columnReviewRating"
+            // TODO: This should make this visible when the feature for reviews/comments is complete.
+            // This should be enabled when the feature is complete: visible: root.previewData.rating >= 0
+            visible: false
             anchors { left: parent.left; right: parent.right }
             spacing: parent.spacing
 
@@ -193,8 +198,6 @@
             AppReviews {
                 id: appReviews
                 objectName: "appReviews"
-                // TODO: This should make this visible when the feature for reviews/comments is complete.
-                visible: false
                 anchors { left: parent.left; right: parent.right }
 
                 model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined

=== 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 @@
     QtObject { id: rated; property int value: 120 }
     QtObject { id: reviews; property int value: 8 }
     QtObject { id: progress; property string value: "source" }
+    QtObject { id: publisher; property string value: "Ubuntu Developer" }
     QtObject { id: comments; property var value: [
             ["Unity User", 4, "08/20/2013", root.commentary],
             ["Unity User", 8, "01/15/2013", root.commentary],
@@ -62,7 +63,8 @@
         property var infoMap: {
             "more-screenshots": screenshots,
             "rated": rated,
-            "comments": comments
+            "comments": comments,
+            "publisher": publisher
         }
         property var actions: [
             { "id": 123, "displayName": "action1" },
@@ -84,6 +86,7 @@
             "more-screenshots": screenshots,
             "rated": rated,
             "comments": comments,
+            "publisher": publisher,
             "progressbar_source": progressSource
         }
         property var actions: [
@@ -137,6 +140,12 @@
             }
         }
 
+        function test_check_app_info() {
+            var appInfo = findChild(appPreview, "appInfo");
+            compare(appInfo.appName, data.title, "App Title doesn't match.");
+            compare(appInfo.publisher, publisher.value, "Publisher name doesn't match.");
+        }
+
         function test_rated() {
             var rated = findChild(appPreview, "ratedLabel");
             compare(rated.text, "(120)", "Rates not equal");
@@ -154,6 +163,8 @@
         }
 
         function test_review_focus() {
+            var columnReviewRating = findChild(appPreview, "columnReviewRating");
+            columnReviewRating.visible = true;
             var appReviews = findChild(appPreview, "appReviews");
             appReviews.visible = true;
             var sendButton = findChild(appReviews, "sendButton");