Ubuntu Music App

Merge lp:~ahayzen/music-app/walkthrough-max-width into lp:music-app/remix

  1. walkthrough-max-width
  2. Merge into remix
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 804
Merged at revision: 803
Proposed branch: lp:~ahayzen/music-app/walkthrough-max-width
Merge into: lp:music-app/remix
Diff against target: 123 lines (+15/-6)
5 files modified
common/Walkthrough/Slide1.qml (+3/-1)
common/Walkthrough/Slide2.qml (+3/-1)
common/Walkthrough/Slide3.qml (+3/-1)
common/Walkthrough/Walkthrough.qml (+5/-2)
music-app.qml (+1/-1)
To merge this branch: bzr merge lp:~ahayzen/music-app/walkthrough-max-width
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+247145@code.launchpad.net

Commit message

* Ensure that walkthrough slides have a max width so that they are consistent with empty states

Description of the change

* Ensure that walkthrough slides have a max width so that they are consistent with empty states

When testing on larger devices, eg the Nexus 7, it was found that the walkthrough does not have a maximum width so the labels can span [0] [1] [2] but the empty states have a maximum width which causes the labels to wrap [3]. This mp ensures that the widths of the empty states/walkthroughs are consistent.

0 - http://popey.mooo.com/screenshots/device-2015-01-21-123249.png
1 - http://popey.mooo.com/screenshots/device-2015-01-21-123342.png
2 - http://popey.mooo.com/screenshots/device-2015-01-21-123330.png
3 - http://popey.mooo.com/screenshots/device-2015-01-21-123424.png

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Looks good..

13:40 <popey> http://popey.mooo.com/screenshots/device-2015-01-21-133806.png
13:40 <popey> http://popey.mooo.com/screenshots/device-2015-01-21-133816.png
13:40 <popey> http://popey.mooo.com/screenshots/device-2015-01-21-133824.png
13:40 <popey> http://popey.mooo.com/screenshots/device-2015-01-21-133832.png

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

PASSED: Continuous integration, rev:801
http://91.189.93.70:8080/job/music-app-ci/1251/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/771
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/771/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/103

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

review: Approve (continuous-integration)
lp:~ahayzen/music-app/walkthrough-max-width updated
802. By Andrew Hayzen

* Merge of trunk

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

PASSED: Continuous integration, rev:802
http://91.189.93.70:8080/job/music-app-ci/1253/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/774
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/774/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/105

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

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

In order to match the visual mockups a few things need to be fixed:

1. In general there needs to be more space between the images and the title text. The title and body text. The text should be more than half way down the screen. This is the reason I had it anchored to the bottom of the screen. Perhaps we can fix this by making the spacing value a % of the window height?
2. Similar to the above, the "Start" button should be far closer to the bottom of the screen. Looking at it now, even my tweak might not have put it close enough to the bottom to match the design spec.

review: Needs Fixing
lp:~ahayzen/music-app/walkthrough-max-width updated
803. By Andrew Hayzen

* Change walkthrough spacing

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

PASSED: Continuous integration, rev:803
http://91.189.93.70:8080/job/music-app-ci/1255/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/793
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/107

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

review: Approve (continuous-integration)
lp:~ahayzen/music-app/walkthrough-max-width updated
804. By Andrew Hayzen

* Revert using Column in sliders

Revision history for this message
Victor Thompson (vthompson) wrote :

LGTM! The walkthrough now has similar width to the empty states and looks pleasing on a wider screen. Thanks!

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

PASSED: Continuous integration, rev:804
http://91.189.93.70:8080/job/music-app-ci/1256/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/796
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/796/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/108

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'common/Walkthrough/Slide1.qml'
--- common/Walkthrough/Slide1.qml 2015-01-20 05:05:57 +0000
+++ common/Walkthrough/Slide1.qml 2015-01-22 01:04:43 +0000
@@ -1,5 +1,6 @@
1/*1/*
2 * Copyright (C) 2014-20152 * Copyright (C) 2014-2015
3 * Andrew Hayzen <ahayzen@gmail.com>
3 * Nekhelesh Ramananthan <nik90@ubuntu.com>4 * Nekhelesh Ramananthan <nik90@ubuntu.com>
4 * Victor Thompson <victor.thompson@gmail.com>5 * Victor Thompson <victor.thompson@gmail.com>
5 *6 *
@@ -54,6 +55,7 @@
54 height: contentHeight55 height: contentHeight
55 horizontalAlignment: Text.AlignHLeft56 horizontalAlignment: Text.AlignHLeft
56 text: i18n.tr("Welcome to Music")57 text: i18n.tr("Welcome to Music")
58 width: units.gu(36)
57 }59 }
5860
59 Label {61 Label {
@@ -66,7 +68,7 @@
66 height: contentHeight68 height: contentHeight
67 horizontalAlignment: Text.AlignHLeft69 horizontalAlignment: Text.AlignHLeft
68 text: i18n.tr("Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how to get started or press skip to start listening now.")70 text: i18n.tr("Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how to get started or press skip to start listening now.")
69 width: parent.width71 width: units.gu(36)
70 wrapMode: Text.WordWrap72 wrapMode: Text.WordWrap
71 }73 }
72 }74 }
7375
=== modified file 'common/Walkthrough/Slide2.qml'
--- common/Walkthrough/Slide2.qml 2015-01-21 00:40:26 +0000
+++ common/Walkthrough/Slide2.qml 2015-01-22 01:04:43 +0000
@@ -1,5 +1,6 @@
1/*1/*
2 * Copyright (C) 2014-20152 * Copyright (C) 2014-2015
3 * Andrew Hayzen <ahayzen@gmail.com>
3 * Nekhelesh Ramananthan <nik90@ubuntu.com>4 * Nekhelesh Ramananthan <nik90@ubuntu.com>
4 * Victor Thompson <victor.thompson@gmail.com>5 * Victor Thompson <victor.thompson@gmail.com>
5 *6 *
@@ -49,6 +50,7 @@
49 fontSize: "x-large"50 fontSize: "x-large"
50 horizontalAlignment: Text.AlignHLeft51 horizontalAlignment: Text.AlignHLeft
51 text: i18n.tr("Import your music")52 text: i18n.tr("Import your music")
53 width: units.gu(36)
52 }54 }
5355
54 Label {56 Label {
@@ -60,7 +62,7 @@
60 fontSize: "large"62 fontSize: "large"
61 horizontalAlignment: Text.AlignHLeft63 horizontalAlignment: Text.AlignHLeft
62 text: i18n.tr("Connect your device to any computer and simply drag files to the Music folder or insert removable media with music.")64 text: i18n.tr("Connect your device to any computer and simply drag files to the Music folder or insert removable media with music.")
63 width: parent.width65 width: units.gu(36)
64 wrapMode: Text.WordWrap66 wrapMode: Text.WordWrap
65 }67 }
66 }68 }
6769
=== modified file 'common/Walkthrough/Slide3.qml'
--- common/Walkthrough/Slide3.qml 2015-01-21 14:05:44 +0000
+++ common/Walkthrough/Slide3.qml 2015-01-22 01:04:43 +0000
@@ -1,5 +1,6 @@
1/*1/*
2 * Copyright (C) 2014-20152 * Copyright (C) 2014-2015
3 * Andrew Hayzen <ahayzen@gmail.com>
3 * Nekhelesh Ramananthan <nik90@ubuntu.com>4 * Nekhelesh Ramananthan <nik90@ubuntu.com>
4 * Victor Thompson <victor.thompson@gmail.com>5 * Victor Thompson <victor.thompson@gmail.com>
5 *6 *
@@ -49,6 +50,7 @@
49 fontSize: "x-large"50 fontSize: "x-large"
50 horizontalAlignment: Text.AlignHLeft51 horizontalAlignment: Text.AlignHLeft
51 text: i18n.tr("Download new music")52 text: i18n.tr("Download new music")
53 width: units.gu(36)
52 }54 }
5355
54 Label {56 Label {
@@ -60,7 +62,7 @@
60 fontSize: "large"62 fontSize: "large"
61 horizontalAlignment: Text.AlignHLeft63 horizontalAlignment: Text.AlignHLeft
62 text: i18n.tr("Directly import music bought while browsing online.")64 text: i18n.tr("Directly import music bought while browsing online.")
63 width: parent.width65 width: units.gu(36)
64 wrapMode: Text.WordWrap66 wrapMode: Text.WordWrap
65 }67 }
6668
6769
=== modified file 'common/Walkthrough/Walkthrough.qml'
--- common/Walkthrough/Walkthrough.qml 2015-01-21 14:05:44 +0000
+++ common/Walkthrough/Walkthrough.qml 2015-01-22 01:04:43 +0000
@@ -1,5 +1,6 @@
1/*1/*
2 * Copyright (C) 2014-20152 * Copyright (C) 2014-2015
3 * Andrew Hayzen <ahayzen@gmail.com>
3 * Nekhelesh Ramananthan <nik90@ubuntu.com>4 * Nekhelesh Ramananthan <nik90@ubuntu.com>
4 * Victor Thompson <victor.thompson@gmail.com>5 * Victor Thompson <victor.thompson@gmail.com>
5 *6 *
@@ -62,11 +63,13 @@
6263
63 Loader {64 Loader {
64 anchors {65 anchors {
65 fill: parent66 bottom: parent.bottom
67 horizontalCenter: parent.horizontalCenter
66 margins: units.gu(2)68 margins: units.gu(2)
69 top: parent.top
67 }70 }
68
69 sourceComponent: modelData71 sourceComponent: modelData
72 width: units.gu(36)
70 }73 }
71 }74 }
72 }75 }
7376
=== modified file 'music-app.qml'
--- music-app.qml 2015-01-21 01:16:38 +0000
+++ music-app.qml 2015-01-22 01:04:43 +0000
@@ -1323,7 +1323,7 @@
1323 centerIn: parent1323 centerIn: parent
1324 }1324 }
1325 spacing: units.gu(4)1325 spacing: units.gu(4)
1326 width: units.gu(35)1326 width: units.gu(36)
13271327
1328 Row {1328 Row {
1329 anchors {1329 anchors {

Subscribers

People subscribed via source and target branches