Ubuntu Music App

Merge lp:~ahayzen/music-app/remix-songs-page-cover-grid into lp:music-app/remix

  1. remix-songs-page-cover-grid
  2. Merge into remix
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 671
Merged at revision: 669
Proposed branch: lp:~ahayzen/music-app/remix-songs-page-cover-grid
Merge into: lp:music-app/remix
Prerequisite: lp:~ahayzen/music-app/remix-cover-grid
Diff against target: 98 lines (+17/-19)
1 file modified
common/SongsPage.qml (+17/-19)
To merge this branch: bzr merge lp:~ahayzen/music-app/remix-songs-page-cover-grid
Reviewer Review Type Date Requested Status
Victor Thompson Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+238081@code.launchpad.net

Commit message

* Make SongsPage use CoverGrid

Description of the change

* Make SongsPage use CoverGrid

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:668
http://91.189.93.70:8080/job/music-app-remix-ci/80/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/903
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/903/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/80

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/80/rebuild

review: Approve (continuous-integration)
lp:~ahayzen/music-app/remix-songs-page-cover-grid updated
669. By Andrew Hayzen

* Merge of upstream

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:669
http://91.189.93.70:8080/job/music-app-remix-ci/85/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/913
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/913/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/85

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/85/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

This looks good, I just have one small inline comment. Feel free to fix it or leave it alone.

lp:~ahayzen/music-app/remix-songs-page-cover-grid updated
670. By Andrew Hayzen

* Merge of upstream

671. By Andrew Hayzen

* Rename albumImage to coversImage

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:671
http://91.189.93.70:8080/job/music-app-remix-ci/89/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/917
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/917/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/89

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/89/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml 2014-10-05 06:08:44 +0000
+++ common/SongsPage.qml 2014-10-13 16:39:16 +0000
@@ -64,11 +64,15 @@
64 BlurredBackground {64 BlurredBackground {
65 id: blurredBackground65 id: blurredBackground
66 height: parent.height66 height: parent.height
67 art: albumImage.source67 art: coversImage.covers.length > 0
68 ? (coversImage.covers[0].art !== undefined
69 ? coversImage.covers[0].art
70 : decodeURIComponent("image://albumart/artist=" + coversImage.covers[0].author + "&album=" + coversImage.covers[0].album))
71 : Qt.resolvedUrl("../images/music-app-cover@30.png")
68 }72 }
6973
70 Image {74 CoverGrid {
71 id: albumImage75 id: coversImage
72 anchors {76 anchors {
73 top: parent.top77 top: parent.top
74 left: parent.left78 left: parent.left
@@ -77,14 +81,8 @@
77 leftMargin: units.gu(2)81 leftMargin: units.gu(2)
78 rightMargin: units.gu(2)82 rightMargin: units.gu(2)
79 }83 }
80 width: units.gu(18)84 covers: songStackPage.covers
81 height: width85 size: units.gu(18)
82 smooth: true
83 source: covers.length > 0
84 ? (covers[0].art !== undefined
85 ? covers[0].art
86 : decodeURIComponent("image://albumart/artist=" + covers[0].author + "&album=" + covers[0].album))
87 : Qt.resolvedUrl("../images/music-app-cover@30.png")
88 }86 }
8987
90 Label {88 Label {
@@ -94,9 +92,9 @@
94 fontSize: "x-large"92 fontSize: "x-large"
95 color: styleMusic.common.music93 color: styleMusic.common.music
96 anchors {94 anchors {
97 top: albumImage.bottom95 top: coversImage.bottom
98 topMargin: units.gu(1)96 topMargin: units.gu(1)
99 left: albumImage.left97 left: coversImage.left
100 right: parent.right98 right: parent.right
101 rightMargin: units.gu(2)99 rightMargin: units.gu(2)
102 }100 }
@@ -116,7 +114,7 @@
116 anchors {114 anchors {
117 top: albumLabel.bottom115 top: albumLabel.bottom
118 topMargin: units.gu(0.75)116 topMargin: units.gu(0.75)
119 left: albumImage.left117 left: coversImage.left
120 right: parent.right118 right: parent.right
121 rightMargin: units.gu(2)119 rightMargin: units.gu(2)
122 }120 }
@@ -134,7 +132,7 @@
134 top: albumArtist.visible ? albumArtist.bottom132 top: albumArtist.visible ? albumArtist.bottom
135 : albumLabel.bottom133 : albumLabel.bottom
136 topMargin: units.gu(1)134 topMargin: units.gu(1)
137 left: albumImage.left135 left: coversImage.left
138 right: parent.right136 right: parent.right
139 rightMargin: units.gu(2)137 rightMargin: units.gu(2)
140 }138 }
@@ -150,7 +148,7 @@
150 anchors {148 anchors {
151 bottom: queueAllRow.top149 bottom: queueAllRow.top
152 bottomMargin: units.gu(2)150 bottomMargin: units.gu(2)
153 left: albumImage.right151 left: coversImage.right
154 leftMargin: units.gu(2)152 leftMargin: units.gu(2)
155 }153 }
156 strokeColor: UbuntuColors.green154 strokeColor: UbuntuColors.green
@@ -187,7 +185,7 @@
187 anchors {185 anchors {
188 bottom: playRow.top186 bottom: playRow.top
189 bottomMargin: units.gu(2)187 bottomMargin: units.gu(2)
190 left: albumImage.right188 left: coversImage.right
191 leftMargin: units.gu(2)189 leftMargin: units.gu(2)
192 }190 }
193 strokeColor: UbuntuColors.green191 strokeColor: UbuntuColors.green
@@ -212,8 +210,8 @@
212 Button {210 Button {
213 id: playRow211 id: playRow
214 anchors {212 anchors {
215 bottom: albumImage.bottom213 bottom: coversImage.bottom
216 left: albumImage.right214 left: coversImage.right
217 leftMargin: units.gu(2)215 leftMargin: units.gu(2)
218 }216 }
219 color: UbuntuColors.green217 color: UbuntuColors.green

Subscribers

People subscribed via source and target branches