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
1=== modified file 'common/SongsPage.qml'
2--- common/SongsPage.qml 2014-10-05 06:08:44 +0000
3+++ common/SongsPage.qml 2014-10-13 16:39:16 +0000
4@@ -64,11 +64,15 @@
5 BlurredBackground {
6 id: blurredBackground
7 height: parent.height
8- art: albumImage.source
9+ art: coversImage.covers.length > 0
10+ ? (coversImage.covers[0].art !== undefined
11+ ? coversImage.covers[0].art
12+ : decodeURIComponent("image://albumart/artist=" + coversImage.covers[0].author + "&album=" + coversImage.covers[0].album))
13+ : Qt.resolvedUrl("../images/music-app-cover@30.png")
14 }
15
16- Image {
17- id: albumImage
18+ CoverGrid {
19+ id: coversImage
20 anchors {
21 top: parent.top
22 left: parent.left
23@@ -77,14 +81,8 @@
24 leftMargin: units.gu(2)
25 rightMargin: units.gu(2)
26 }
27- width: units.gu(18)
28- height: width
29- smooth: true
30- source: covers.length > 0
31- ? (covers[0].art !== undefined
32- ? covers[0].art
33- : decodeURIComponent("image://albumart/artist=" + covers[0].author + "&album=" + covers[0].album))
34- : Qt.resolvedUrl("../images/music-app-cover@30.png")
35+ covers: songStackPage.covers
36+ size: units.gu(18)
37 }
38
39 Label {
40@@ -94,9 +92,9 @@
41 fontSize: "x-large"
42 color: styleMusic.common.music
43 anchors {
44- top: albumImage.bottom
45+ top: coversImage.bottom
46 topMargin: units.gu(1)
47- left: albumImage.left
48+ left: coversImage.left
49 right: parent.right
50 rightMargin: units.gu(2)
51 }
52@@ -116,7 +114,7 @@
53 anchors {
54 top: albumLabel.bottom
55 topMargin: units.gu(0.75)
56- left: albumImage.left
57+ left: coversImage.left
58 right: parent.right
59 rightMargin: units.gu(2)
60 }
61@@ -134,7 +132,7 @@
62 top: albumArtist.visible ? albumArtist.bottom
63 : albumLabel.bottom
64 topMargin: units.gu(1)
65- left: albumImage.left
66+ left: coversImage.left
67 right: parent.right
68 rightMargin: units.gu(2)
69 }
70@@ -150,7 +148,7 @@
71 anchors {
72 bottom: queueAllRow.top
73 bottomMargin: units.gu(2)
74- left: albumImage.right
75+ left: coversImage.right
76 leftMargin: units.gu(2)
77 }
78 strokeColor: UbuntuColors.green
79@@ -187,7 +185,7 @@
80 anchors {
81 bottom: playRow.top
82 bottomMargin: units.gu(2)
83- left: albumImage.right
84+ left: coversImage.right
85 leftMargin: units.gu(2)
86 }
87 strokeColor: UbuntuColors.green
88@@ -212,8 +210,8 @@
89 Button {
90 id: playRow
91 anchors {
92- bottom: albumImage.bottom
93- left: albumImage.right
94+ bottom: coversImage.bottom
95+ left: coversImage.right
96 leftMargin: units.gu(2)
97 }
98 color: UbuntuColors.green

Subscribers

People subscribed via source and target branches