Merge lp:~ahayzen/music-app/remix-card-view-perf-001 into lp:music-app/remix

[Andrew Hayzen]

* Performance tweaks
* Change scrolling behaviour
* Tweaks to ListItemWithActions.qml

* Performance tweaks
* Change scrolling behaviour
* Tweaks to ListItemWithActions.qml

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

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

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

A few questions and things to fix:

1. Will your changes sill allow the Recent table in the database to be created in time in all cases? It appears as though the use of isRecentEmpty() in the MainView Component.onCompleted should still allow this to work, but we should verify that there are no cases that this wont work.

2. When I "Tap to shuffle music" there seems to be an issue with the queue or player not working. The duration is 0:00 and the song will not play. Also, any song selected in the queue will not work.

review: Needs Fixing

[Victor Thompson (vthompson)]

Also, it will need the fix so the empty playlists page is shown in the proper tab. Right now it is shown in the Songs tab when there are no playlists. Perhaps we should look into landing the remember-queue MP? It should be working.

[lp:~ahayzen/music-app/remix-card-view-perf-001]

701. By Andrew Hayzen on 2014-10-24

* Run createRecent() from Component.onCompleted

[Andrew Hayzen (ahayzen)]

1) Changed to ensure that the createRecent() is always run
2) Wasn't able to reproduce?
3) I agree this should land after the remember mp

[Victor Thompson (vthompson)]

I think #2 was a glitch in how I was adding files. Files were in the mediascanner db but did not exist at the time on the device. Disregard.

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

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

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-card-view-perf-001]

702. By Andrew Hayzen on 2014-10-27

* Merge of lp:music-app/remix

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

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

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-card-view-perf-001]

703. By Andrew Hayzen on 2014-10-28

* Merge of lp:music-app/remix

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

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

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-card-view-perf-001]

704. By Andrew Hayzen on 2014-10-28

* Merge of lp:music-app/remix

705. By Andrew Hayzen on 2014-10-28

* Merge of lp:music-app/remix

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

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

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-card-view-perf-001]

706. By Andrew Hayzen on 2014-10-28

* Merge of lp:music-app/remix

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

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

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-28 00:57:09 +0000
+++ MusicNowPlaying.qml	2014-10-28 04:28:44 +0000
@@ -573,6 +573,14 @@
                 }
             }
 
+            Component.onCompleted: {
+                // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+                // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+                var scaleFactor = units.gridUnit / 8;
+                maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+                flickDeceleration = flickDeceleration * scaleFactor;
+            }
+
             Component {
                 id: queueDelegate
                 ListItemWithActions {

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2014-10-28 00:00:26 +0000
+++ MusicTracks.qml	2014-10-28 04:28:44 +0000
@@ -119,6 +119,14 @@
             sort.order: Qt.AscendingOrder
         }
 
+        Component.onCompleted: {
+            // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+            // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+            var scaleFactor = units.gridUnit / 8;
+            maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+            flickDeceleration = flickDeceleration * scaleFactor;
+        }
+
         // Requirements for ListItemWithActions
         property var selectedItems: []
 

=== modified file 'common/CardView.qml'
--- common/CardView.qml	2014-10-27 22:32:47 +0000
+++ common/CardView.qml	2014-10-28 04:28:44 +0000
@@ -65,4 +65,12 @@
             columns: parseInt(width / itemWidth)
         }
     }
+
+    Component.onCompleted: {
+        // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+        // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+        var scaleFactor = units.gridUnit / 8;
+        maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+        flickDeceleration = flickDeceleration * scaleFactor;
+    }
 }

=== modified file 'common/ListItemWithActions.qml'
--- common/ListItemWithActions.qml	2014-10-22 19:47:39 +0000
+++ common/ListItemWithActions.qml	2014-10-28 04:28:44 +0000
@@ -98,7 +98,7 @@
         }
 
         for (var j=0; j < main.children.length; j++) {
-            main.children[j].anchors.rightMargin = reorderable && selectionMode ? actionReorder.width + units.gu(2) : 0
+            main.children[j].anchors.rightMargin = reorderable && selectionMode ? actionReorderLoader.width + units.gu(2) : 0
         }
 
         parent.parent.state = selectionMode ? "multiselectable" : "normal"
@@ -151,7 +151,7 @@
         updatePosition(finalX)
 
         if (leftSideAction !== null) {  // CUSTOM
-            leftActionIcon.primed = main.x > (finalX * root.threshold)
+            leftActionViewLoader.item.primed = main.x > (finalX * root.threshold)
         }
     }
 
@@ -176,7 +176,7 @@
 
     function getActionAt(point)
     {
-        if (contains(leftActionView, point, 0)) {
+        if (leftSideAction && contains(leftActionViewLoader.item, point, 0)) {
             return leftSideAction
         } else if (contains(rightActionsView, point, 0)) {
             var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
@@ -211,7 +211,7 @@
     function resetPrimed()  // CUSTOM
     {
         if (leftSideAction !== null) {
-            leftActionIcon.primed = false
+            leftActionViewLoader.item.primed = false
         }
 
         for (var j=0; j < rightSideActions.length; j++) {
@@ -339,31 +339,41 @@
     height: defaultHeight
     //clip: height !== defaultHeight  // CUSTOM
 
-    Rectangle {
-        id: leftActionView
-
+    Loader {  // CUSTOM
+        id: leftActionViewLoader
         anchors {
             top: parent.top
             bottom: parent.bottom
             right: main.left
         }
-        width: root.leftActionWidth + actionThreshold
-        visible: leftSideAction
-        color: UbuntuColors.red
-
-        Icon {
-            id: leftActionIcon
-            anchors {
-                centerIn: parent
-                horizontalCenterOffset: actionThreshold / 2
+        asynchronous: true
+        sourceComponent: leftSideAction ? leftActionViewComponent : undefined
+    }
+
+    Component {  // CUSTOM
+        id: leftActionViewComponent
+
+        Rectangle {
+            id: leftActionView
+            width: root.leftActionWidth + actionThreshold
+            color: UbuntuColors.red
+
+            property alias primed: leftActionIcon.primed  // CUSTOM
+
+            Icon {
+                id: leftActionIcon
+                anchors {
+                    centerIn: parent
+                    horizontalCenterOffset: actionThreshold / 2
+                }
+                objectName: "swipeDeleteAction"  // CUSTOM
+                name: leftSideAction && _showActions ? leftSideAction.iconName : ""
+                color: Theme.palette.selected.field
+                height: units.gu(3)
+                width: units.gu(3)
+
+                property bool primed: false  // CUSTOM
             }
-            objectName: "swipeDeleteAction"  // CUSTOM
-            name: leftSideAction && _showActions ? leftSideAction.iconName : ""
-            color: Theme.palette.selected.field
-            height: units.gu(3)
-            width: units.gu(3)
-
-            property bool primed: false  // CUSTOM
         }
     }
 
@@ -374,7 +384,7 @@
        anchors {
            top: main.top
            left: main.right
-           leftMargin: reordering ? actionReorder.width : units.gu(1)  // CUSTOM
+           leftMargin: reordering ? actionReorder.width : 0  // CUSTOM
            bottom: main.bottom
        }
        visible: _visibleRightSideActions.length > 0
@@ -487,96 +497,106 @@
     }
 
     /* CUSTOM Reorder Component */
-    Item {
-        id: actionReorder
+    Loader {
+        id: actionReorderLoader
         anchors {
             bottom: parent.bottom
             right: main.right
             rightMargin: units.gu(1)
             top: parent.top
         }
-        width: units.gu(4)
-        visible: reorderable && selectionMode && root.parent.parent.selectedItems.length === 0
-
-        Icon {
-            anchors {
-                horizontalCenter: parent.horizontalCenter
-                verticalCenter: parent.verticalCenter
-            }
-            name: "navigation-menu"  // TODO: use proper image
-            height: width
-            width: units.gu(3)
-        }
-
-        MouseArea {
-            id: actionReorderMouseArea
-            anchors {
-                fill: parent
-            }
-            property int startY: 0
-            property int startContentY: 0
-
-            onPressed: {
-                root.parent.parent.interactive = false;  // stop scrolling of listview
-                startY = root.y;
-                startContentY = root.parent.parent.contentY;
-                root.z += 10;  // force ontop of other elements
-
-                console.debug("Reorder listitem pressed", root.y)
-            }
-            onMouseYChanged: root.y += mouse.y - (root.height / 2);
-            onReleased: {
-                console.debug("Reorder diff by position", getDiff());
-
-                var diff = getDiff();
-
-                // Remove the height of the actual item if moved down
-                if (diff > 0) {
-                    diff -= 1;
-                }
-
-                root.parent.parent.interactive = true;  // reenable scrolling
-
-                if (diff === 0) {
-                    // Nothing has changed so reset the item
-                    // z index is restored after animation
-                    resetListItemYAnimation.start();
-                }
-                else {
-                    var newIndex = index + diff;
-
-                    if (newIndex < 0) {
-                        newIndex = 0;
-                    }
-                    else if (newIndex > root.parent.parent.count - 1) {
-                        newIndex = root.parent.parent.count - 1;
-                    }
-
-                    root.z -= 10;  // restore z index
-                    reorder(index, newIndex)
-                }
-            }
-
-            function getDiff() {
-                // Get the amount of items that have been passed over (by centre)
-                return Math.round((((root.y - startY) + (root.parent.parent.contentY - startContentY)) / root.height) + 0.5);
-            }
-        }
-
-        SequentialAnimation {
-            id: resetListItemYAnimation
-            UbuntuNumberAnimation {
-                target: root;
-                property: "y";
-                to: actionReorderMouseArea.startY
-            }
-            ScriptAction {
-                script: {
-                    root.z -= 10;  // restore z index
-                }
-            }
-        }
-    }
+        asynchronous: true
+        sourceComponent: reordering ? actionReorderComponent : undefined
+    }
+
+    Component {
+        id: actionReorderComponent
+        Item {
+            id: actionReorder
+            width: units.gu(4)
+            visible: reorderable && selectionMode && root.parent.parent.selectedItems.length === 0
+
+            Icon {
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                    verticalCenter: parent.verticalCenter
+                }
+                name: "navigation-menu"  // TODO: use proper image
+                height: width
+                width: units.gu(3)
+            }
+
+            MouseArea {
+                id: actionReorderMouseArea
+                anchors {
+                    fill: parent
+                }
+                property int startY: 0
+                property int startContentY: 0
+
+                onPressed: {
+                    root.parent.parent.interactive = false;  // stop scrolling of listview
+                    startY = root.y;
+                    startContentY = root.parent.parent.contentY;
+                    root.z += 10;  // force ontop of other elements
+
+                    console.debug("Reorder listitem pressed", root.y)
+                }
+                onMouseYChanged: root.y += mouse.y - (root.height / 2);
+                onReleased: {
+                    console.debug("Reorder diff by position", getDiff());
+
+                    var diff = getDiff();
+
+                    // Remove the height of the actual item if moved down
+                    if (diff > 0) {
+                        diff -= 1;
+                    }
+
+                    root.parent.parent.interactive = true;  // reenable scrolling
+
+                    if (diff === 0) {
+                        // Nothing has changed so reset the item
+                        // z index is restored after animation
+                        resetListItemYAnimation.start();
+                    }
+                    else {
+                        var newIndex = index + diff;
+
+                        if (newIndex < 0) {
+                            newIndex = 0;
+                        }
+                        else if (newIndex > root.parent.parent.count - 1) {
+                            newIndex = root.parent.parent.count - 1;
+                        }
+
+                        root.z -= 10;  // restore z index
+                        reorder(index, newIndex)
+                    }
+                }
+
+                function getDiff() {
+                    // Get the amount of items that have been passed over (by centre)
+                    return Math.round((((root.y - startY) + (root.parent.parent.contentY - startContentY)) / root.height) + 0.5);
+                }
+            }
+
+            SequentialAnimation {
+                id: resetListItemYAnimation
+                UbuntuNumberAnimation {
+                    target: root;
+                    property: "y";
+                    to: actionReorderMouseArea.startY
+                }
+                ScriptAction {
+                    script: {
+                        root.z -= 10;  // restore z index
+                    }
+                }
+            }
+        }
+    }
+
 
     SequentialAnimation {
         id: triggerAction
@@ -641,7 +661,7 @@
             target: locked ? null : main
             axis: Drag.XAxis
             minimumX: rightActionsView.visible ? -(rightActionsView.width) : 0
-            maximumX: leftActionView.visible ? leftActionView.width : 0
+            maximumX: leftSideAction ? leftActionViewLoader.item.width : 0
             threshold: root.actionThreshold
         }
 

=== modified file 'common/MusicRow.qml'
--- common/MusicRow.qml	2014-10-22 19:47:39 +0000
+++ common/MusicRow.qml	2014-10-28 04:28:44 +0000
@@ -66,7 +66,6 @@
         anchors {
             verticalCenter: parent.verticalCenter
         }
-        asynchronous: true
         width: imageSource === undefined ? parent.width - parent.spacing
                                          : parent.width - image.width - parent.spacing
 

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-10-28 02:07:49 +0000
+++ common/SongsPage.qml	2014-10-28 04:28:44 +0000
@@ -214,6 +214,14 @@
             }
         }
 
+        Component.onCompleted: {
+            // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+            // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+            var scaleFactor = units.gridUnit / 8;
+            maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+            flickDeceleration = flickDeceleration * scaleFactor;
+        }
+
         header: BlurredHeader {
             rightColumn: Column {
                 spacing: units.gu(2)

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-28 03:39:35 +0000
+++ music-app.qml	2014-10-28 04:28:44 +0000
@@ -551,8 +551,6 @@
         customdebug("Version "+appVersion) // print the curren version
         customdebug("Arguments on startup: Debug: "+args.values.debug)
 
-        customdebug("Arguments on startup: Debug: "+args.values.debug+ " and file: ")
-
         Library.createRecent()  // initialize recent
 
         // initialize playlists