Merge lp:~vthompson/music-app/allow-current-to-resize into lp:music-app/trusty

[Victor Thompson]

Allow currently playing item to resize in narrow mode.

Allow currently playing item to resize in narrow mode. With devices of varying sizes the currently playing item in the Now Playing page needs to be able to dynmically change it's size. The change here, allows this item to before almost as large as the view, but only when in narrow mode. Right now, I'm of the opinion that any device that is in narrow or phone mode should behave this way. This includes the Nexus 7, which once the the app uses better cover art, won't look so bad.

Nexus 4 before: http://i.imgur.com/CVAI4Bq.png
Nexus 4 after: http://i.imgur.com/AuJd8A4.png

Nexus 7 before: http://i.imgur.com/nlf2lGB.png
Nexus 7 after: http://i.imgur.com/eEnspdo.png

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:605
http://91.189.93.70:8080/job/music-app-ci/1081/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1731
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/305

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

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

#blocked bug 1363314

[Andrew Hayzen (ahayzen)]

Awesome looks good :)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-08-21 23:15:34 +0000
+++ MusicNowPlaying.qml	2014-08-29 00:36:46 +0000
@@ -213,7 +213,11 @@
                             leftMargin: units.gu(1.5)
                         }
                         count: 1
-                        size: (queueListItem.state === "current" ? queuelist.currentHeight : queuelist.normalHeight) - units.gu(2)
+                        size: (queueListItem.state === "current"
+                               ? (mainView.wideAspect
+                                  ? queuelist.currentHeight
+                                  : mainView.width - (trackImage.anchors.leftMargin * 2))
+                               : queuelist.normalHeight) - units.gu(2)
                         covers: [{author: model.author, album: model.album}]
 
                         spacing: units.gu(2)
@@ -311,7 +315,7 @@
                     name: "current"
                     PropertyChanges {
                         target: queueListItem
-                        height: queuelist.currentHeight
+                        height: trackImage.height + (trackContainer.anchors.margins * 2)
                     }
                     PropertyChanges {
                         target: nowPlayingArtist