Merge lp:~ahayzen/music-app/listitem-actions-take-2 into lp:music-app/trusty

[Andrew Hayzen]

* Remove expander, reorder, swipedelete code
* Use ListItemWithActions from other apps
* Implement actions for add to playlist, add to queue, edit playlist, delete playlist
* Implement reordering

* Remove expander, reorder, swipedelete code
* Use ListItemWithActions from other apps
* Implement actions for add to playlist, add to queue, edit playlist, delete playlist
* Implement reordering

This makes use of a mod'd version ListItemWithActions.qml used in other apps such as address-book and clock-app-reboot and therefore should be preferred over [0].

0 - https://code.launchpad.net/~andrew-hayzen/music-app/listitem-actions/+merge/220290

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

FAILED: Continuous integration, rev:549
http://91.189.93.70:8080/job/music-app-ci/971/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1281
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1281/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/195

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

550. By Andrew Hayzen on 2014-08-05

* Fixes for autopilot

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

FAILED: Continuous integration, rev:550
http://91.189.93.70:8080/job/music-app-ci/975/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1301
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1301/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/199

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

551. By Andrew Hayzen on 2014-08-06

* Add primed var to actions so autopilot can tell which actions are visible

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

FAILED: Continuous integration, rev:551
http://91.189.93.70:8080/job/music-app-ci/980/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1321
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/204

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

552. By Andrew Hayzen on 2014-08-06

* Correct objectNames for autopilot

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

FAILED: Continuous integration, rev:552
http://91.189.93.70:8080/job/music-app-ci/981/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1328
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1328/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/205

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

553. By Andrew Hayzen on 2014-08-07

* Merge of trunk

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

FAILED: Continuous integration, rev:553
http://91.189.93.70:8080/job/music-app-ci/984/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1341
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/208

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

554. By Andrew Hayzen on 2014-08-07

* Fixes for ap tests and swipeDelete not functioning

555. By Andrew Hayzen on 2014-08-07

* Switch colour of rightactions to Orange

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

FAILED: Continuous integration, rev:555
http://91.189.93.70:8080/job/music-app-ci/986/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1406/console
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/210/console

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

556. By Andrew Hayzen on 2014-08-07

* Merge of trunk

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

FAILED: Continuous integration, rev:556
http://91.189.93.70:8080/job/music-app-ci/987/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1407
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/211

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

557. By Andrew Hayzen on 2014-08-07

* Fix for ap so that it waits for the action animation to complete before accessing the playlist page

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

PASSED: Continuous integration, rev:557
http://91.189.93.70:8080/job/music-app-ci/988/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1413
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1413/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/212

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I've noticed three things, functionally, that need fixing:

1. Currently when you delete a playlist, it is removed before the action is confirmed.
2. The reorder functionality hasn't been applied to playlists.
3. The list item actions on the right appear to be a bit too close to the edge closest to the item.

Things that we should consider changing:

4. I think the list item actions when 'inactive' should be white in color, rather than grey.
5. We should consider using a different color rather than orange for the 'active' action. It looks OK, but there might be a better option
6. I'm still not a huge fan of the red background color for the delete action.

review: Needs Fixing

[lp:~ahayzen/music-app/listitem-actions-take-2]

558. By Andrew Hayzen on 2014-08-08

* Enable reordering for playlists
* Remove extra remove dialogue when removing a playlist
* Increase rightAction margin

[Andrew Hayzen (ahayzen)]

1) Fixed, it was incorrectly showing the dialogue after you had already confirmed removal.
2) Fixed, reordering wasn't enabled on that page :) and fixed another bug in the transition of the code from v1->v2 which meant you could attempt to move beyond the model bounds.
3) Fixed, put a left margin on the rightActions to match the spacing

4) & 5) Maybe we should have grey for inactive and white for active?
6) I'm not a huge fan either but it is growing on me.

For 4), 5) & 6) we need to ensure that we remain as consistent as possible with the other apps (clock-app-reboot and address-book) using this component (hence keeping the red and grey colours). But I'm open to suggestions.

[lp:~ahayzen/music-app/listitem-actions-take-2]

559. By Andrew Hayzen on 2014-08-08

* Fix margins of now playing so item is centred

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

PASSED: Continuous integration, rev:558
http://91.189.93.70:8080/job/music-app-ci/989/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1432
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1432/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/213

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:559
http://91.189.93.70:8080/job/music-app-ci/990/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1433
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1433/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/214

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

560. By Andrew Hayzen on 2014-08-08

* Switch rightSideAction to be white/orange

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

PASSED: Continuous integration, rev:560
http://91.189.93.70:8080/job/music-app-ci/991/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1439
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1439/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/215

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Things to fix:

1. Could you update the .pot file since there are translatable items changing? (mostly some are being removed)
2. Deleting a song from a playlist is not working. I see the following in the log when I remove a song:

file:///opt/click.ubuntu.com/com.ubuntu.music/1.3.560/common/SongsPage.qml:216: ReferenceError: model is not defined

So for the code looks pretty good though.

review: Needs Fixing

[Victor Thompson (vthompson)]

Additional things:

3. The elide needs to be fixed so text doesn't collide with the reorder icon.
4. Currently any view that has a reorder active will stay in reorder mode when you change views. I do not think we should be done this. One bad thing this causes is that if you put a playlist into reorder mode and then view an album or genre it will appear as though it's in reorder mode as well. Items can then be dragged around--with no affect. It also seems like it might break the model until the app is restarted.

review: Needs Fixing

[lp:~ahayzen/music-app/listitem-actions-take-2]

561. By Andrew Hayzen on 2014-08-11

* Fix removing track from playlist
* Fix elide of text when reordering
* Rebuild .pot
* Cancel reordering if focus is lost

[Andrew Hayzen (ahayzen)]

1) Rebuilt
2) Fixed, the Loader was outside of the ListItem so couldn't access the model
3) Fixed, margin now exists so labels are then elide'd
4) Fixed, reordering is now cancelled if the visibility is lost on the listview

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

PASSED: Continuous integration, rev:561
http://91.189.93.70:8080/job/music-app-ci/993/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1456
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/217

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/listitem-actions-take-2]

562. By Andrew Hayzen on 2014-08-11

* Refresh playlist model count when child track is removed

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

PASSED: Continuous integration, rev:562
http://91.189.93.70:8080/job/music-app-ci/994/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1457
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/218

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This looks good! Great work!

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-06-24 19:35:57 +0000
+++ MusicNowPlaying.qml	2014-08-11 00:34:14 +0000
@@ -22,10 +22,9 @@
 import QtQuick 2.0
 import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Thumbnailer 0.1
 import "common"
-import "common/ExpanderItems"
+import "common/ListItemActions"
 import "settings.js" as Settings
 
 MusicPage {
@@ -56,7 +55,6 @@
                 return;
             }
 
-            collapseExpand();  // Collapse expanded tracks
             queuelist.currentIndex = player.currentIndex;
 
             customdebug("MusicQueue update currentIndex: " + player.source);
@@ -87,7 +85,6 @@
         objectName: "queuelist"
         anchors.fill: parent
         anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
-        spacing: units.gu(1)
         delegate: queueDelegate
         model: trackQueue.model
         highlightFollowsCurrentItem: false
@@ -126,369 +123,53 @@
 
         Component {
             id: queueDelegate
-            ListItem.Standard {
+            ListItemWithActions {
                 id: queueListItem
+                color: "transparent"
                 height: queuelist.normalHeight
-                state: queuelist.currentIndex == index ? "current" : ""
-
-                // cached height used to restore the height after expansion
-                property int cachedHeight: -1
-
-                SwipeDelete {
-                    id: swipeBackground
-                    duration: queuelist.transitionDuration
-
-                    onDeleteStateChanged: {
-                        if (deleteState === true)
-                        {
-                            queueListItemRemoveAnimation.start();
-                        }
-                    }
-                }
-
-                function onCollapseSwipeDelete(indexCol)
-                {
-                    if ((indexCol !== index || indexCol === -1) && swipeBackground !== undefined && swipeBackground.direction !== "")
-                    {
-                        customdebug("auto collapse swipeDelete")
-                        queueListItemResetStartAnimation.start();
-                    }
-                }
-
-                Component.onCompleted: {
-                    collapseSwipeDelete.connect(onCollapseSwipeDelete);
-                }
-
-                MouseArea {
-                    id: queueArea
-                    anchors.fill: parent
-
-                    property int startX: queueListItem.x
-                    property int startY: queueListItem.y
-                    property int startMouseY: -1
-
-                    // Allow dragging on the X axis for swipeDelete if not reordering
-                    drag.target: queueListItem
-                    drag.axis: Drag.XAxis
-                    drag.minimumX: queuelist.state == "reorder" ? 0 : -queueListItem.width
-                    drag.maximumX: queuelist.state == "reorder" ? 0 : queueListItem.width
-
-                    /* Get the mouse and item difference from the starting positions */
-                    function getDiff(mouseY)
-                    {
-                        return (mouseY - startMouseY) + (queueListItem.y - startY);
-                    }
-
-                    /*
-                     * Has the mouse crossed the current item
-                     * True - it has crossed
-                     * NULL - it is on the current
-                     * False - it has not crossed
-                     */
-                    function hasCrossedCurrent(diff, currentOffset)
-                    {
-                        // Only crossed if in same direction
-                        if ((diff > 0 || currentOffset > 0) && (diff <= 0 || currentOffset <= 0))
-                        {
-                            return false;
-                        }
-
-                        if (Math.abs(diff) > (Math.abs(currentOffset) * queuelist.normalHeight) + queuelist.currentHeight)
-                        {
-                            return true;
-                        }
-                        else if (Math.abs(diff) > (Math.abs(currentOffset) * queuelist.normalHeight))
-                        {
-                            return null;
-                        }
-                        else
-                        {
-                            return false;
-                        }
-                    }
-
-                    function getNewIndex(mouseY, index)
-                    {
-                        var diff = getDiff(mouseY);
-                        var negPos = diff < 0 ? -1 : 1;
-                        var currentOffset = queuelist.currentIndex - index;  // get the current offset
-
-                        if (currentOffset < 0)  // when current is less the offset is actually +1
-                        {
-                            currentOffset += 1;
-                        }
-
-                        var hasCrossed = hasCrossedCurrent(diff, currentOffset);
-
-                        if (hasCrossed === true)
-                        {
-                            /* Take off difference so it just appears like a normalheight
-                             * minus when after and add when before */
-                            diff -= negPos * (queuelist.currentHeight - queuelist.normalHeight);
-                        }
-                        else if (hasCrossed === null)
-                        {
-                            // Work out how far into the current item it is
-                            var tmpDiff = Math.abs(diff) - (Math.abs(currentOffset) * queuelist.normalHeight);
-
-                            // Scale difference so is the same as a normalHeight
-                            tmpDiff *= (queuelist.normalHeight / queuelist.currentHeight);
-
-                            // rebuild Diff with new values
-                            diff = (currentOffset * queuelist.normalHeight) + (negPos * tmpDiff);
-                        }
-
-                        return index + (Math.round(diff / queuelist.normalHeight));
-                    }
-
-                    onClicked: {
-                        collapseSwipeDelete(-1);  // collapse all expands
-                        customdebug("File: " + model.filename) // debugger
-                        trackQueueClick(index);  // toggle track state
-                    }
-
-                    onMouseXChanged: {
-                        // Only allow XChange if not in reorder state
-                        if (queuelist.state == "reorder")
-                        {
-                            return;
-                        }
-
-                        // New X is less than start so swiping left
-                        if (queueListItem.x < startX)
-                        {
-                            collapseExpand();
-                            swipeBackground.state = "swipingLeft";
-                            startY = queueListItem.y;
-                        }
-                        // New X is greater sow swiping right
-                        else if (queueListItem.x > startX)
-                        {
-                            collapseExpand();
-                            swipeBackground.state = "swipingRight";
-                            startY = queueListItem.y;
-                        }
-                        // Same so reset state back to normal
-                        else
-                        {
-                            swipeBackground.state = "normal";
-                            queuelist.state = "normal";
-                        }
-                    }
-
-                    onMouseYChanged: {
-                        // Y change only affects when in reorder mode
-                        if (queuelist.state == "reorder")
-                        {
-                            /* update the listitem y position so that the
-                             * listitem horizontalCenter is under the mouse.y */
-                            queueListItem.y += mouse.y - (queueListItem.height / 2);
-                        }
-                    }
-
-                    onPressed: {
-                        startX = queueListItem.x;
-                        startY = queueListItem.y;
-                        startMouseY = mouse.y;
-                    }
-
-                    onPressAndHold: {
-                        // Must be in a normal state to change to reorder state
-                        if (queuelist.state == "normal" && swipeBackground.state == "normal" && queuelist.currentIndex != index)
-                        {
-                            collapseSwipeDelete(-1);  // collapse all swipedeletes
-                            collapseExpand();  // collapse all
-                            customdebug("Pressed and held queued track "+model.filename)
-                            queuelist.state = "reorder";  // enable reordering state
-                            trackContainerReorderAnimation.start();
-                        }
-                    }
-
-                    onReleased: {
-                        // Get current state to determine what to do
-                        if (queuelist.state == "reorder")
-                        {
-                            var newIndex = getNewIndex(mouse.y + (queueListItem.height / 2), index);  // get new index
-
-                            // Indexes larger than current need -1 because when it is moved the current is removed
-                            if (newIndex > index)
-                            {
-                                newIndex -= 1;
-                            }
-
-                            if (newIndex === index)
-                            {
-                                queueListItemResetAnimation.start();  // reset item position
-                                trackContainerResetAnimation.start();  // reset the trackContainer
-                            }
-                            else
-                            {
-                                queueListItem.x = startX;  // ensure X position is correct
-                                trackContainerResetAnimation.start();  // reset the trackContainer
-
-                                // Check that the newIndex is within the range
-                                if (newIndex < 0)
-                                {
-                                    newIndex = 0;
-                                }
-                                else if (newIndex > queuelist.count - 1)
-                                {
-                                    newIndex = queuelist.count - 1;
-                                }
-
-                                console.debug("Move: " + index + " To: " + newIndex);
-                                queuelist.model.move(index, newIndex, 1);  // update the model
-                            }
-                        }
-                        else if (swipeBackground.state == "swipingLeft" || swipeBackground.state == "swipingRight")
-                        {
-                            var moved = Math.abs(queueListItem.x - startX);
-
-                            // Make sure that item has been dragged far enough
-                            if (moved > queueListItem.width / 2 || (swipeBackground.primed === true && moved > units.gu(5)))
-                            {
-                                if (swipeBackground.primed === false)
-                                {
-                                    collapseSwipeDelete(index);  // collapse other swipeDeletes
-
-                                    // Move the listitem half way across to reveal the delete button
-                                    queueListItemPrepareRemoveAnimation.start();
-                                }
-                                else
-                                {
-                                    // Check that actually swiping to cancel
-                                    if (swipeBackground.direction !== "" &&
-                                            swipeBackground.direction !== swipeBackground.state)
-                                    {
-                                        // Reset the listitem to the centre
-                                        queueListItemResetStartAnimation.start();
-                                    }
-                                    else
-                                    {
-                                        // Reset the listitem to the centre
-                                        queueListItemResetAnimation.start();
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                // Reset the listitem to the centre
-                                queueListItemResetAnimation.start();
-                            }
-                        }
-
-                        // ensure states are normal
-                        swipeBackground.state = "normal";
-                        queuelist.state = "normal";
-                    }
-
-                    // Animation to reset the x, y of the queueitem
-                    ParallelAnimation {
-                        id: queueListItemResetAnimation
-                        running: false
-                        NumberAnimation {  // reset X
-                            target: queueListItem
-                            property: "x"
-                            to: queueArea.startX
-                            duration: queuelist.transitionDuration
-                        }
-                        NumberAnimation {  // reset Y
-                            target: queueListItem
-                            property: "y"
-                            to: queueArea.startY
-                            duration: queuelist.transitionDuration
-                        }
-                    }
-
-                    // Animation to reset the x, y of the item
-                    ParallelAnimation {
-                        id: queueListItemResetStartAnimation
-                        running: false
-                        NumberAnimation {  // reset X
-                            target: queueListItem
-                            property: "x"
-                            to: 0
-                            duration: queuelist.transitionDuration
-                        }
-                        NumberAnimation {  // reset Y
-                            target: queueListItem
-                            property: "y"
-                            to: queueArea.startY
-                            duration: queuelist.transitionDuration
-                        }
-                        onRunningChanged: {
-                            if (running === true)
-                            {
-                                swipeBackground.direction = "";
-                                swipeBackground.primed = false;
-                            }
-                        }
-                    }
-
-                    // Move the listitem half way across to reveal the delete button
-                    NumberAnimation {
-                        id: queueListItemPrepareRemoveAnimation
-                        target: queueListItem
-                        property: "x"
-                        to: swipeBackground.state == "swipingRight" ? queueListItem.width / 2 : 0 - (queueListItem.width / 2)
-                        duration: queuelist.transitionDuration
-                        onRunningChanged: {
-                            if (running === true)
-                            {
-                                swipeBackground.direction = swipeBackground.state;
-                                swipeBackground.primed = true;
-                            }
-                        }
-                    }
-
-                    ParallelAnimation {
-                        id: queueListItemRemoveAnimation
-                        running: false
-                        NumberAnimation {  // 'slide' up
-                            target: queueListItem
-                            property: "height"
-                            to: 0
-                            duration: queuelist.transitionDuration
-                        }
-                        NumberAnimation {  // 'slide' in direction of removal
-                            target: queueListItem
-                            property: "x"
-                            to: swipeBackground.direction === "swipingLeft" ? 0 - queueListItem.width : queueListItem.width
-                            duration: queuelist.transitionDuration
-                        }
-                        onRunningChanged: {
-                            if (running === false)
-                            {
-                                // Remove the item
-                                if (index == queuelist.currentIndex)
-                                {
-                                    if (queuelist.count > 1)
-                                    {
-                                        // Next song and only play if currently playing
-                                        player.nextSong(player.isPlaying);
-                                    }
-                                    else
-                                    {
-                                        player.stop();
-                                    }
-                                }
-
-                                if (index < player.currentIndex) {
-                                    player.currentIndex -= 1;
-                                }
-
-                                // Remove item from queue and clear caches
-                                trackQueue.model.remove(index);
-                            }
-                        }
-                    }
-                }
-
-                onFocusChanged: {
-                    if (focus == false) {
-                        selected = false
-                    } else {
-                        selected = false
+                state: queuelist.currentIndex == index && !reordering ? "current" : ""
+
+                leftSideAction: Remove {
+                    onTriggered: {
+                        if (index === player.currentIndex) {
+                            player.nextSong(player.isPlaying);
+                        }
+
+                        if (index < player.currentIndex) {
+                            // update index as the old has been removed
+                            player.currentIndex -= 1;
+                        }
+
+                        queuelist.model.remove(index);
+                    }
+                }
+                reorderable: true
+                rightSideActions: [
+                    AddToPlaylist{
+
+                    }
+                ]
+                triggerActionOnMouseRelease: true
+
+                onItemClicked: {
+                    customdebug("File: " + model.filename) // debugger
+                    trackQueueClick(index);  // toggle track state
+                }
+                onReorder: {
+                    console.debug("Move: ", from, to);
+
+                    queuelist.model.move(from, to, 1);
+
+
+                    // Maintain currentIndex with current song
+                    if (from === player.currentIndex) {
+                        player.currentIndex = to;
+                    }
+                    else if (from < player.currentIndex && to >= player.currentIndex) {
+                        player.currentIndex -= 1;
+                    }
+                    else if (from > player.currentIndex && to <= player.currentIndex) {
+                        player.currentIndex += 1;
                     }
                 }
 
@@ -496,8 +177,7 @@
                     id: trackContainer;
                     anchors {
                         fill: parent
-                        margins: units.gu(0.5)
-                        rightMargin: expandable.expanderButtonWidth
+                        margins: units.gu(1)
                     }
                     color: "transparent"
 
@@ -599,31 +279,6 @@
                     }
                 }
 
-                Expander {
-                    id: expandable
-                    anchors {
-                        fill: parent
-                    }
-                    actualListItemHeight: queueListItem.state === "current" ?
-                                              queuelist.currentHeight :
-                                              queuelist.normalHeight
-                    buttonEnabled: !swipeBackground.primed
-                    expanderButtonCentreFromBottom: queuelist.normalHeight - (trackContainer.anchors.margins * 2) - nowPlayingTitle.y - (nowPlayingTitle.height / 2)
-                    listItem: queueListItem
-                    model: trackQueue.model.get(index)
-                    row: Row {
-                        AddToPlaylist {
-                        }
-                    }
-                    Behavior on actualListItemHeight {
-                        NumberAnimation {
-                            target: expandable;
-                            property: "actualListItemHeight";
-                            duration: queuelist.transitionDuration;
-                        }
-                    }
-                }
-
                 states: State {
                     name: "current"
                     PropertyChanges {
@@ -648,10 +303,6 @@
                         x: trackImage.x
                         y: nowPlayingTitle.y + nowPlayingTitle.height + units.gu(1.25)
                     }
-                    PropertyChanges {
-                        target: expandable
-                        expanderButtonCentreFromBottom: queuelist.currentHeight - (trackContainer.anchors.margins * 2) - nowPlayingTitle.y - (nowPlayingTitle.height / 2)
-                    }
                 }
                 transitions: Transition {
                     from: ",current"

=== modified file 'MusicPlaylists.qml'
--- MusicPlaylists.qml	2014-08-06 02:26:18 +0000
+++ MusicPlaylists.qml	2014-08-11 00:34:14 +0000
@@ -20,16 +20,14 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
 import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
 import "settings.js" as Settings
 import "scrobble.js" as Scrobble
 import "playlists.js" as Playlists
 import "common"
-import "common/ExpanderItems"
+import "common/ListItemActions"
 
 // page for the playlists
 MusicPage {
@@ -110,35 +108,6 @@
         }
     }
 
-    // Remove playlist dialog
-    Component {
-        id: removePlaylistDialog
-        Dialog {
-            id: dialogueRemovePlaylist
-            // TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
-            title: i18n.tr("Are you sure?")
-            text: i18n.tr("This will delete your playlist.")
-
-            Button {
-                text: i18n.tr("Remove")
-                color: styleMusic.dialog.confirmButtonColor
-                onClicked: {
-                    // removing playlist
-                    Playlists.removePlaylist(oldPlaylistName)
-
-                    playlistModel.filterPlaylists();
-
-                    PopupUtils.close(dialogueRemovePlaylist)
-                }
-            }
-            Button {
-                text: i18n.tr("Cancel")
-                color: styleMusic.dialog.cancelButtonColor
-                onClicked: PopupUtils.close(dialogueRemovePlaylist)
-            }
-        }
-    }
-
     MusicSettings {
         id: musicSettings
     }
@@ -159,13 +128,40 @@
 
         Component {
             id: playlistDelegate
-            ListItem.Standard {
+            ListItemWithActions {
                 id: playlist
                 property string name: model.name
                 property string count: model.count
                 property var covers: Playlists.getPlaylistCovers(name)
+
+                color: "transparent"
                 height: styleMusic.common.itemHeight
-                iconFrame: false
+                width: parent.width
+
+                leftSideAction: DeletePlaylist {
+                    onTriggered: {
+                        Playlists.removePlaylist(model.name)
+
+                        playlistModel.filterPlaylists();
+                    }
+                }
+
+                rightSideActions: [
+                    EditPlaylist {
+                    }
+                ]
+                triggerActionOnMouseRelease: true
+
+                onItemClicked: {
+                    albumTracksModel.filterPlaylistTracks(name)
+                    songsPage.isAlbum = false
+                    songsPage.line1 = "Playlist"
+                    songsPage.line2 = model.name
+                    songsPage.covers =  playlist.covers
+                    songsPage.title = i18n.tr("Playlist")
+
+                    mainPageStack.push(songsPage)
+                }
 
                 MusicRow {
                     covers: playlist.covers
@@ -185,34 +181,6 @@
                         }
                     }
                 }
-
-                Expander {
-                    id: expandable
-                    anchors {
-                        fill: parent
-                    }
-                    listItem: playlist
-                    model: {"name": name, "index": index}
-                    row: Row {
-                        EditPlaylist {
-
-                        }
-                        DeletePlaylist {
-
-                        }
-                    }
-                }
-
-                onClicked: {
-                    albumTracksModel.filterPlaylistTracks(name)
-                    songsPage.isAlbum = false
-                    songsPage.line1 = "Playlist"
-                    songsPage.line2 = model.name
-                    songsPage.covers =  playlist.covers
-                    songsPage.title = i18n.tr("Playlist")
-
-                    mainPageStack.push(songsPage)
-                }
             }
         }
     }

=== modified file 'MusicSearch.qml'
--- MusicSearch.qml	2014-07-11 22:29:21 +0000
+++ MusicSearch.qml	2014-08-11 00:34:14 +0000
@@ -27,7 +27,7 @@
 import QtQuick.LocalStorage 2.0
 import "playlists.js" as Playlists
 import "common"
-import "common/ExpanderItems"
+import "common/ListItemActions"
 
 Item {
     id: sheetItem
@@ -154,13 +154,23 @@
                          searchTrackView.forceActiveFocus()
                      }
 
-                     delegate: ListItem.Standard {
+                     delegate: ListItemWithActions {
                             id: search
+                            color: "transparent"
                             objectName: "playlist"
                             width: parent.width
                             height: styleMusic.common.itemHeight
 
-                            onClicked: {
+                            rightSideActions: [
+                                AddToQueue {
+
+                                },
+                                AddToPlaylist {
+
+                                }
+                            ]
+
+                            onItemClicked: {
                                 console.debug("Debug: "+title+" added to queue")
                                 // now play this track, but keep current queue
                                 trackQueue.append(model)
@@ -193,23 +203,6 @@
                                     }
                                 }
                             }
-
-                            Expander {
-                                id: expandable
-                                anchors {
-                                    fill: parent
-                                }
-                                listItem: search
-                                model: songsSearchModel.get(index, songsSearchModel.RoleModelData)
-                                row: Row {
-                                    AddToPlaylist {
-
-                                    }
-                                    AddToQueue {
-
-                                    }
-                                }
-                            }
                      }
                  }
              }

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2014-07-11 22:29:21 +0000
+++ MusicTracks.qml	2014-08-11 00:34:14 +0000
@@ -20,8 +20,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components 1.1 as Toolkit
-import Ubuntu.Components.ListItems 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.MediaScanner 0.1
 import Ubuntu.Thumbnailer 0.1
 import QtMultimedia 5.0
@@ -29,7 +27,7 @@
 import "settings.js" as Settings
 import "playlists.js" as Playlists
 import "common"
-import "common/ExpanderItems"
+import "common/ListItemActions"
 
 
 MusicPage {
@@ -41,6 +39,7 @@
         anchors.fill: parent
         anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
         highlightFollowsCurrentItem: false
+        objectName: "trackstab-listview"
         model: Toolkit.SortFilterModel {
             id: songsModelFilter
             property alias rowCount: songsModel.rowCount
@@ -54,21 +53,23 @@
         delegate: trackDelegate
         Component {
             id: trackDelegate
-            ListItem.Standard {
+
+            ListItemWithActions {
                 id: track
+                color: "transparent"
                 width: parent.width
                 height: styleMusic.common.itemHeight
 
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        if (focus == false) {
-                            focus = true
-                        }
+                rightSideActions: [
+                    AddToQueue {
+                    },
+                    AddToPlaylist {
 
-                        trackClicked(tracklist.model, index)  // play track
                     }
-                }
+                ]
+                triggerActionOnMouseRelease: true
+
+                onItemClicked: trackClicked(tracklist.model, index)  // play track
 
                 MusicRow {
                     covers: [{author: model.author, album: model.album}]
@@ -98,23 +99,6 @@
                     }
                 }
 
-                Expander {
-                    id: expandable
-                    anchors {
-                        fill: parent
-                    }
-                    listItem: track
-                    model: songsModelFilter.get(index, songsModelFilter.RoleModelData)
-                    row: Row {
-                        AddToPlaylist {
-
-                        }
-                        AddToQueue {
-
-                        }
-                    }
-                }
-
                 states: State {
                     name: "Current"
                     when: track.ListView.isCurrentItem

=== modified file 'MusicaddtoPlaylist.qml'
--- MusicaddtoPlaylist.qml	2014-07-28 00:00:45 +0000
+++ MusicaddtoPlaylist.qml	2014-08-11 00:34:14 +0000
@@ -37,6 +37,7 @@
 // Page that will be used when adding tracks to playlists
 MusicPage {
     id: addtoPlaylist
+    objectName: "addToPlaylistPage"
     title: i18n.tr("Select playlist")
     visible: false
 

=== modified file 'common/CMakeLists.txt'
--- common/CMakeLists.txt	2014-06-13 12:29:43 +0000
+++ common/CMakeLists.txt	2014-08-11 00:34:14 +0000
@@ -1,4 +1,4 @@
-add_subdirectory(ExpanderItems)
+add_subdirectory(ListItemActions)
 
 # make the qml files visible on qtcreator
 file(GLOB COMMON_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)

=== removed file 'common/Expander.qml'
--- common/Expander.qml	2014-05-23 15:00:21 +0000
+++ common/Expander.qml	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2013, 2014
- *      Andrew Hayzen <[e-mail]>
- *      Daniel Holm <[e-mail]>
- *      Victor Thompson <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Item {
-    id: expander
-    property int actualListItemHeight: -1
-    property alias backgroundOpacity: expandedBackground.opacity
-    property bool buttonEnabled: true
-    property int expanderButtonCentreFromBottom: -1
-    property alias expanderButtonWidth: expandableButton.width
-    property var listItem: null
-    property var model: null
-    property alias row: expanderRowLoader.sourceComponent
-    property bool expanderVisible: false
-    property bool _heightChangeLock: false
-
-    Component.onCompleted: {
-        if (listItem !== null && actualListItemHeight === -1) {
-            actualListItemHeight = listItem.height;
-        }
-        if (listItem !== null && expanderButtonCentreFromBottom === -1) {
-            expanderButtonCentreFromBottom = listItem.height / 2;
-        }
-
-        collapseExpand.connect(onCollapseExpand);
-    }
-
-    function onCollapseExpand(indexCol)
-    {
-        if (expander !== undefined && expander.expanderVisible) {
-            customdebug("auto collapse")
-            expander.expanderVisible = false;
-        }
-    }
-
-    Connections {
-        target: listItem
-        onHeightChanged: {
-            if (!expander._heightChangeLock && expander.expanderVisible) {
-                expander._heightChangeLock = true;
-                listItem.height += styleMusic.common.expandHeight;
-                expander._heightChangeLock = false;
-            }
-        }
-    }
-
-    onExpanderVisibleChanged: {
-        expander._heightChangeLock = true;
-        if (expanderVisible) {
-            listItem.height += styleMusic.common.expandHeight;
-        }
-        else {
-            listItem.height -= styleMusic.common.expandHeight;
-        }
-        expander._heightChangeLock = false;
-    }
-
-    Rectangle {
-        id: expandableButton
-        anchors {
-            bottom: parent.bottom
-            bottomMargin: expanderVisible ? expandedContainer.height : undefined
-            right: parent.right
-        }
-        color: "transparent"
-        height: expanderButtonCentreFromBottom * 2
-        width: expandableButtonImage.width * 2
-
-        Image {
-            id: expandableButtonImage
-            anchors {
-                left: parent.left
-                verticalCenter: parent.verticalCenter
-            }
-            source: "../images/dropdown-menu.svg"
-            height: styleMusic.common.expandedItem
-            objectName: "expanditem"
-            rotation: expander.expanderVisible? 180 : 0
-            width: styleMusic.common.expandedItem
-        }
-
-        MouseArea {
-            anchors {
-                horizontalCenter: parent.horizontalCenter
-                top: parent.top
-            }
-            height: parent.height
-            width: parent.width + units.gu(1)
-            onClicked: {
-                if (!expander.buttonEnabled) {
-                    return;
-                }
-
-                var expanderState = expander.expanderVisible;
-
-                collapseExpand();
-                expander.expanderVisible = !expanderState;
-            }
-        }
-    }
-
-    Rectangle {
-        id: expandedContainer
-        anchors {
-            top: parent.top
-            topMargin: actualListItemHeight
-        }
-        color: "transparent"
-        height: styleMusic.common.expandHeight
-        visible: expander.expanderVisible
-        width: parent.width
-
-        Rectangle {
-            id: expandedBackground
-            anchors {
-                fill: parent
-            }
-            color: styleMusic.common.black
-            opacity: 0.4
-        }
-
-        MouseArea {
-            anchors {
-                fill: parent
-            }
-            onClicked: mouse.accepted = true
-        }
-
-        Rectangle {
-            anchors {
-                fill: parent
-                leftMargin: styleMusic.common.expandedLeftMargin
-            }
-            color: "transparent"
-            Loader {
-                id: expanderRowLoader
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                property alias expanderLink: expander
-            }
-        }
-
-    }
-}

=== removed directory 'common/ExpanderItems'
=== removed file 'common/ExpanderItems/AddToPlaylist.qml'
--- common/ExpanderItems/AddToPlaylist.qml	2014-07-28 00:00:45 +0000
+++ common/ExpanderItems/AddToPlaylist.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
- *                    Daniel Holm <[e-mail]>
- *                    Victor Thompson <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-// add to playlist
-Rectangle {
-    id: playlistRow
-    color: "transparent"
-    height: styleMusic.common.expandHeight
-    width: units.gu(15)
-    Icon {
-        id: playlistTrack
-        anchors.verticalCenter: parent.verticalCenter
-        color: styleMusic.common.white
-        name: "add-to-playlist"
-        height: styleMusic.common.expandedItem
-        width: styleMusic.common.expandedItem
-    }
-    Label {
-        anchors {
-            left: playlistTrack.right
-            leftMargin: units.gu(0.5)
-            verticalCenter: parent.verticalCenter
-        }
-        color: styleMusic.common.white
-        fontSize: "small"
-        maximumLineCount: 3
-        objectName: "addtoplaylist"
-        text: i18n.tr("Add to playlist")
-        width: parent.width - playlistTrack.width - units.gu(1)
-        wrapMode: Text.WordWrap
-    }
-    MouseArea {
-       anchors.fill: parent
-       onClicked: {
-           parent.parent.parent.expanderLink.expanderVisible = false;
-           chosenElement = makeDict(parent.parent.parent.expanderLink.model);
-           console.debug("Debug: Add track to playlist");
-           mainPageStack.push(addtoPlaylist)
-       }
-    }
-}

=== removed file 'common/ExpanderItems/AddToQueue.qml'
--- common/ExpanderItems/AddToQueue.qml	2014-07-13 00:16:14 +0000
+++ common/ExpanderItems/AddToQueue.qml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
- *                    Daniel Holm <[e-mail]>
- *                    Victor Thompson <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Rectangle {
-    id: queueRow
-    color: "transparent"
-    height: styleMusic.common.expandHeight
-    width: units.gu(15)
-    Icon {
-        id: queueTrack
-        anchors.verticalCenter: parent.verticalCenter
-        color: styleMusic.common.white
-        name: "add"
-        height: styleMusic.common.expandedItem
-        width: styleMusic.common.expandedItem
-    }
-    Label {
-        anchors {
-            left: queueTrack.right
-            leftMargin: units.gu(0.5)
-            verticalCenter: parent.verticalCenter
-        }
-        color: styleMusic.common.white
-        fontSize: "small"
-        maximumLineCount: 3
-        objectName: "queuetrack"
-        text: i18n.tr("Add to queue")
-        wrapMode: Text.WordWrap
-        width: parent.width - queueTrack.width - units.gu(1)
-    }
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            parent.parent.parent.expanderLink.expanderVisible = false
-            console.debug("Debug: Add track to queue: " + parent.parent.parent.expanderLink.model)
-            trackQueue.append(parent.parent.parent.expanderLink.model)
-        }
-    }
-}

=== removed file 'common/ExpanderItems/CMakeLists.txt'
--- common/ExpanderItems/CMakeLists.txt	2014-06-13 12:29:43 +0000
+++ common/ExpanderItems/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-# make the qml files visible on qtcreator
-file(GLOB EXPANDERITEMS_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)
-
-add_custom_target(com_ubuntu_music_EXPANDERITEMS_QMLFiles ALL SOURCES ${EXPANDERITEMS_QML_FILES})

=== removed file 'common/ExpanderItems/DeletePlaylist.qml'
--- common/ExpanderItems/DeletePlaylist.qml	2014-07-28 00:00:45 +0000
+++ common/ExpanderItems/DeletePlaylist.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
- *                    Daniel Holm <[e-mail]>
- *                    Victor Thompson <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Rectangle {
-    id: deleteColumn
-    color: "transparent"
-    height: styleMusic.common.expandHeight
-    width: units.gu(15)
-    Icon {
-        id: deletePlaylistIcon
-        anchors {
-            left: parent.left
-            verticalCenter: parent.verticalCenter
-        }
-        color: styleMusic.common.white
-        name: "delete"
-        height: styleMusic.common.expandedItem
-        width: styleMusic.common.expandedItem
-    }
-    Label {
-        anchors {
-            left: deletePlaylistIcon.right
-            leftMargin: units.gu(0.5)
-            verticalCenter: parent.verticalCenter
-        }
-        color: styleMusic.common.white
-        fontSize: "small"
-        // TRANSLATORS: this refers to deleting a playlist
-        text: i18n.tr("Delete")
-    }
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            parent.parent.parent.expanderLink.expanderVisible = false;
-            customdebug("Delete")
-            oldPlaylistName = parent.parent.parent.expanderLink.model.name
-            PopupUtils.open(removePlaylistDialog, mainView)
-        }
-    }
-}

=== removed file 'common/ExpanderItems/EditPlaylist.qml'
--- common/ExpanderItems/EditPlaylist.qml	2014-07-28 00:00:45 +0000
+++ common/ExpanderItems/EditPlaylist.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
- *                    Daniel Holm <[e-mail]>
- *                    Victor Thompson <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Rectangle {
-    id: editColumn
-    color: "transparent"
-    height: styleMusic.common.expandHeight
-    width: units.gu(15)
-    Icon {
-        id: editPlaylistIcon
-        anchors {
-            left: parent.left
-            verticalCenter: parent.verticalCenter
-        }
-        color: styleMusic.common.white
-        name: "edit"
-        height: styleMusic.common.expandedItem
-        width: styleMusic.common.expandedItem
-    }
-    Label {
-        anchors {
-            left: editPlaylistIcon.right
-            leftMargin: units.gu(0.5)
-            verticalCenter: parent.verticalCenter
-        }
-        color: styleMusic.common.white
-        fontSize: "small"
-        // TRANSLATORS: this refers to editing a playlist
-        text: i18n.tr("Edit")
-    }
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            parent.parent.parent.expanderLink.expanderVisible = false;
-            customdebug("Edit playlist")
-            oldPlaylistName = parent.parent.parent.expanderLink.model.name
-            PopupUtils.open(editPlaylistDialog, mainView)
-        }
-    }
-}

=== added directory 'common/ListItemActions'
=== added file 'common/ListItemActions/AddToPlaylist.qml'
--- common/ListItemActions/AddToPlaylist.qml	1970-01-01 00:00:00 +0000
+++ common/ListItemActions/AddToPlaylist.qml	2014-08-11 00:34:14 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
+ *                    Daniel Holm <[e-mail]>
+ *                    Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Action {
+    iconName: "add-to-playlist"
+    objectName: "addToPlaylistAction"
+    text: i18n.tr("Add to playlist")
+
+    property bool primed: false
+
+    onTriggered: {
+       chosenElement = makeDict(model);
+       console.debug("Debug: Add track to playlist");
+       mainPageStack.push(addtoPlaylist)
+    }
+}

=== added file 'common/ListItemActions/AddToQueue.qml'
--- common/ListItemActions/AddToQueue.qml	1970-01-01 00:00:00 +0000
+++ common/ListItemActions/AddToQueue.qml	2014-08-11 00:34:14 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
+ *                    Daniel Holm <[e-mail]>
+ *                    Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Action {
+    iconName: "add"
+    objectName: "addToQueueAction"
+    text: i18n.tr("Add to Queue")
+
+    onTriggered: {
+        console.debug("Debug: Add track to queue: " + model)
+        trackQueue.append(model)
+    }
+}

=== added file 'common/ListItemActions/CMakeLists.txt'
--- common/ListItemActions/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ common/ListItemActions/CMakeLists.txt	2014-08-11 00:34:14 +0000
@@ -0,0 +1,4 @@
+# make the qml files visible on qtcreator
+file(GLOB ACTIONITEMS_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)
+
+add_custom_target(com_ubuntu_music_ACTIONITEMS_QMLFiles ALL SOURCES ${ACTIONITEMS_QML_FILES})

=== added file 'common/ListItemActions/DeletePlaylist.qml'
--- common/ListItemActions/DeletePlaylist.qml	1970-01-01 00:00:00 +0000
+++ common/ListItemActions/DeletePlaylist.qml	2014-08-11 00:34:14 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
+ *                    Daniel Holm <[e-mail]>
+ *                    Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Action {
+    iconName: "delete"
+    // TRANSLATORS: this refers to deleting a playlist
+    text: i18n.tr("Delete")
+
+    property bool primed: false
+}

=== added file 'common/ListItemActions/EditPlaylist.qml'
--- common/ListItemActions/EditPlaylist.qml	1970-01-01 00:00:00 +0000
+++ common/ListItemActions/EditPlaylist.qml	2014-08-11 00:34:14 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
+ *                    Daniel Holm <[e-mail]>
+ *                    Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 0.1
+
+Action {
+    iconName: "edit"
+    // TRANSLATORS: this refers to editing a playlist
+    text: i18n.tr("Edit")
+
+    property bool primed: false
+
+    onTriggered: {
+        customdebug("Edit playlist")
+        oldPlaylistName = model.name
+        PopupUtils.open(editPlaylistDialog, mainView)
+    }
+}

=== added file 'common/ListItemActions/Remove.qml'
--- common/ListItemActions/Remove.qml	1970-01-01 00:00:00 +0000
+++ common/ListItemActions/Remove.qml	2014-08-11 00:34:14 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2014 Andrew Hayzen <[e-mail]>
+ *                    Daniel Holm <[e-mail]>
+ *                    Victor Thompson <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Action {
+    id: removeAction
+    iconName: "delete"
+    objectName: "swipeDeleteAction"
+    text: i18n.tr("Remove")
+
+    property bool primed: false
+}

=== added file 'common/ListItemWithActions.qml'
--- common/ListItemWithActions.qml	1970-01-01 00:00:00 +0000
+++ common/ListItemWithActions.qml	2014-08-11 00:34:14 +0000
@@ -0,0 +1,547 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+
+ListItem.Standard {  // CUSTOM
+//Item {
+    id: root
+
+    property Action leftSideAction: null
+    property list<Action> rightSideActions
+    property double defaultHeight: units.gu(8)
+    property bool locked: false
+    property Action activeAction: null
+    property var activeItem: null
+    property bool triggerActionOnMouseRelease: false
+    property alias color: main.color
+    default property alias contents: main.children
+
+    property bool reorderable: false  // CUSTOM
+    property bool reordering: false  // CUSTOM
+
+    readonly property double actionWidth: units.gu(5)
+    readonly property double leftActionWidth: units.gu(10)
+    readonly property double actionThreshold: actionWidth * 0.4
+    readonly property double threshold: 0.4
+    readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
+    readonly property alias swipping: mainItemMoving.running
+
+    signal itemClicked(var mouse)
+    signal itemPressAndHold(var mouse)
+
+    signal reorder(int from, int to)  // CUSTOM
+
+    onItemPressAndHold: reordering = reorderable && !reordering  // CUSTOM
+    onReorderingChanged: {  // CUSTOM
+        if (reordering) {
+            resetSwipe()
+        }
+
+        for (var j=0; j < main.children.length; j++) {
+            main.children[j].anchors.rightMargin = reordering ? actionReorder.width + units.gu(2) : 0
+        }
+
+        parent.state = reordering ? "reorder" : "normal"
+    }
+
+    function returnToBoundsRTL()
+    {
+        var actionFullWidth = actionWidth + units.gu(2)
+        var xOffset = Math.abs(main.x)
+        var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
+        var j;  // CUSTOM
+
+        if (index < 1) {
+            main.x = 0
+
+            resetPrimed()  // CUSTOM
+        } else if (index === rightSideActions.length) {
+            main.x = -rightActionsView.width
+
+            for (j=0; j < rightSideActions.length; j++) {  // CUSTOM
+                rightActionsRepeater.itemAt(j).primed = true
+            }
+        } else {
+            main.x = -(actionFullWidth * index)
+
+            for (j=0; j < rightSideActions.length; j++) {  // CUSTOM
+                rightActionsRepeater.itemAt(j).primed = j === index
+            }
+        }
+    }
+
+    function returnToBoundsLTR()
+    {
+        var finalX = leftActionWidth
+        if (main.x > (finalX * root.threshold))
+            main.x = finalX
+        else {
+            main.x = 0
+
+            resetPrimed()  // CUSTOM
+        }
+
+        if (leftSideAction !== null) {  // CUSTOM
+            leftActionIcon.primed = main.x > (finalX * root.threshold)
+        }
+    }
+
+    function returnToBounds()
+    {
+        if (main.x < 0) {
+            returnToBoundsRTL()
+        } else if (main.x > 0) {
+            returnToBoundsLTR()
+        } else {  // CUSTOM
+            resetPrimed()  // CUSTOM
+        }
+    }
+
+    function contains(item, point)
+    {
+        return (point.x >= item.x) && (point.x <= (item.x + item.width)) && (point.y >= item.y) && (point.y <= (item.y + item.height));
+    }
+
+    function getActionAt(point)
+    {
+        if (contains(leftActionView, point)) {
+            return leftSideAction
+        } else if (contains(rightActionsView, point)) {
+            var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
+            for (var i = 0; i < rightActionsRepeater.count; i++) {
+                var child = rightActionsRepeater.itemAt(i)
+                if (contains(child, newPoint)) {
+                    return i
+                }
+            }
+        }
+        return -1
+    }
+
+    function updateActiveAction()
+    {
+        if ((main.x <= -root.actionWidth) &&
+            (main.x > -rightActionsView.width)) {
+            var actionFullWidth = actionWidth + units.gu(2)
+            var xOffset = Math.abs(main.x)
+            var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
+            index = index - 1
+            if (index > -1) {
+                root.activeItem = rightActionsRepeater.itemAt(index)
+                root.activeAction = root.rightSideActions[index]
+            }
+        } else {
+            root.activeAction = null
+        }
+    }
+
+    function resetPrimed()  // CUSTOM
+    {
+        if (leftSideAction !== null) {
+            leftActionIcon.primed = false
+        }
+
+        for (var j=0; j < rightSideActions.length; j++) {
+            rightActionsRepeater.itemAt(j).primed = false
+        }
+    }
+
+    function resetSwipe()
+    {
+        main.x = 0
+
+        resetPrimed()  // CUSTOM
+    }
+
+    Connections {  // CUSTOM
+        target: mainView
+        onListItemSwiping: {
+            if (i !== index) {
+                root.resetSwipe();
+            }
+        }
+    }
+
+    Connections {  // CUSTOM
+        target: root.parent
+        onStateChanged: reordering = root.parent.state === "reorder"
+        onVisibleChanged: {
+            if (!visible) {
+                reordering = false
+            }
+        }
+    }
+
+    Component.onCompleted: reordering = root.parent.state === "reorder"  // CUSTOM
+
+    /* CUSTOM Dim Component */
+    Rectangle {
+        id: listItemDim
+        anchors {
+            fill: parent
+        }
+
+        color: mouseArea.pressed ? styleMusic.common.black : "transparent"
+        opacity: 0.1
+
+        property bool dim: false
+
+        Behavior on color {
+            ColorAnimation {
+                duration: UbuntuAnimation.SlowDuration
+            }
+        }
+    }
+
+    // CUSTOM remove animation
+    SequentialAnimation {
+        id: removeAnimation
+
+        property var action
+
+        UbuntuNumberAnimation {
+            target: root
+            duration: UbuntuAnimation.BriskDuration
+            property: "height";
+            to: 0
+        }
+        ScriptAction {
+            script: removeAnimation.action.trigger()
+        }
+    }
+
+    height: defaultHeight
+    clip: height !== defaultHeight
+
+    Rectangle {
+        id: leftActionView
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: main.left
+        }
+        width: root.leftActionWidth + actionThreshold
+        visible: leftSideAction
+        color: "red"
+
+        Icon {
+            id: leftActionIcon
+            anchors {
+                centerIn: parent
+                horizontalCenterOffset: actionThreshold / 2
+            }
+            objectName: "swipeDeleteAction"  // CUSTOM
+            name: leftSideAction ? leftSideAction.iconName : ""
+            color: Theme.palette.selected.field
+            height: units.gu(3)
+            width: units.gu(3)
+
+            property bool primed: false  // CUSTOM
+        }
+    }
+
+    Item {
+       id: rightActionsView
+
+       anchors {
+           top: main.top
+           left: main.right
+           leftMargin: reordering ? actionReorder.width : units.gu(1)  // CUSTOM
+           bottom: main.bottom
+       }
+       visible: rightSideActions.length > 0
+       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + actionThreshold : 0
+
+       Rectangle {  // CUSTOM
+           anchors {
+               bottom: parent.bottom
+               left: parent.left
+               top: parent.top
+           }
+           color: styleMusic.common.black
+           opacity: 0.7
+           width: parent.width + actionThreshold
+       }
+
+       Row {
+           anchors {
+               fill: parent
+               leftMargin: units.gu(2)  // CUSTOM
+           }
+           spacing: units.gu(2)
+           Repeater {
+               id: rightActionsRepeater
+
+               model: rightSideActions
+               Item {
+                   property alias image: img
+
+                   anchors {
+                       top: parent.top
+                       bottom: parent.bottom
+                   }
+                   width: root.actionWidth
+
+                   property alias primed: img.primed  // CUSTOM
+
+                   Icon {
+                       id: img
+
+                       anchors.centerIn: parent
+                       objectName: rightSideActions[index].objectName  // CUSTOM
+                       width: units.gu(3)
+                       height: units.gu(3)
+                       name: iconName
+                       color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? UbuntuColors.orange : styleMusic.common.white  // CUSTOM
+
+                       property bool primed: false  // CUSTOM
+                   }
+               }
+           }
+       }
+    }
+
+    Rectangle {
+        id: main
+        objectName: "mainItem"
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+        }
+
+        width: parent.width
+
+        Behavior on x {
+            UbuntuNumberAnimation {
+                id: mainItemMoving
+
+                easing.type: Easing.OutElastic
+                duration: UbuntuAnimation.SlowDuration
+            }
+        }
+    }
+
+    /* CUSTOM Reorder Component */
+    Rectangle {
+        id: actionReorder
+        anchors {
+            bottom: parent.bottom
+            right: main.right
+            rightMargin: units.gu(1)
+            top: parent.top
+        }
+        color: "transparent"
+        width: units.gu(4)
+        visible: reordering
+
+        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
+
+        property var currentItem: root.activeItem ? root.activeItem.image : null
+
+        running: false
+        ParallelAnimation {
+            UbuntuNumberAnimation {
+                target: triggerAction.currentItem
+                property: "opacity"
+                from: 1.0
+                to: 0.0
+                duration: UbuntuAnimation.SlowDuration
+                easing {type: Easing.InOutBack; }
+            }
+            UbuntuNumberAnimation {
+                target: triggerAction.currentItem
+                properties: "width, height"
+                from: units.gu(3)
+                to: root.actionWidth
+                duration: UbuntuAnimation.SlowDuration
+                easing {type: Easing.InOutBack; }
+            }
+        }
+        PropertyAction {
+            target: triggerAction.currentItem
+            properties: "width, height"
+            value: units.gu(3)
+        }
+        PropertyAction {
+            target: triggerAction.currentItem
+            properties: "opacity"
+            value: 1.0
+        }
+        ScriptAction {
+            script: root.activeAction.triggered(root)
+        }
+        PauseAnimation {
+            duration: 500
+        }
+        UbuntuNumberAnimation {
+            target: main
+            property: "x"
+            to: 0
+        }
+        ScriptAction {
+            script: resetPrimed()
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+
+        property bool locked: root.locked || ((root.leftSideAction === null) && (root.rightSideActions.count === 0)) || reordering  // CUSTOM
+        property bool manual: false
+
+        anchors.fill: parent
+        drag {
+            target: locked ? null : main
+            axis: Drag.XAxis
+            minimumX: rightActionsView.visible ? -(rightActionsView.width + root.actionThreshold) : 0
+            maximumX: leftActionView.visible ? leftActionView.width : 0
+        }
+
+        onReleased: {
+            if (root.triggerActionOnMouseRelease && root.activeAction) {
+                triggerAction.start()
+            } else {
+                root.returnToBounds()
+                root.activeAction = null
+            }
+        }
+        onClicked: {
+            if (reordering) {  // CUSTOM
+                reordering = false
+            }
+            else if (main.x === 0) {
+                root.itemClicked(mouse)
+            } else if (main.x > 0) {
+                var action = getActionAt(Qt.point(mouse.x, mouse.y))
+                if (action && action !== -1) {
+                    //action.triggered(root)
+                    removeAnimation.action = action  // CUSTOM
+                    removeAnimation.start()  // CUSTOM
+                }
+            } else {
+                var actionIndex = getActionAt(Qt.point(mouse.x, mouse.y))
+                if (actionIndex !== -1) {
+                    root.activeItem = rightActionsRepeater.itemAt(actionIndex)
+                    root.activeAction = root.rightSideActions[actionIndex]
+                    triggerAction.start()
+                    return
+                }
+            }
+            root.resetSwipe()
+        }
+
+        onPositionChanged: {
+            if (mouseArea.pressed) {
+                updateActiveAction()
+
+                listItemSwiping(index)  // CUSTOM
+            }
+        }
+        onPressAndHold: {
+            if (main.x === 0) {
+                root.itemPressAndHold(mouse)
+            }
+        }
+        z: -1
+    }
+}

=== modified file 'common/MusicRow.qml'
--- common/MusicRow.qml	2014-07-11 23:54:41 +0000
+++ common/MusicRow.qml	2014-08-11 00:34:14 +0000
@@ -26,8 +26,7 @@
         left: parent.left
         leftMargin: units.gu(1)
         right: parent.right
-        // Set to expander item width for now set to 1GU when using listitem actions
-        rightMargin: (styleMusic.common.expandedItem * 2) + units.gu(1)
+        rightMargin: units.gu(1)
     }
 
     property alias covers: coverRow.covers

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-07-21 23:36:02 +0000
+++ common/SongsPage.qml	2014-08-11 00:34:14 +0000
@@ -24,7 +24,8 @@
 import Ubuntu.Thumbnailer 0.1
 import QtQuick.LocalStorage 2.0
 import "../meta-database.js" as Library
-import "ExpanderItems"
+import "../playlists.js" as Playlists
+import "ListItemActions"
 
 MusicPage {
     id: songStackPage
@@ -55,6 +56,7 @@
         }
         delegate: albumTracksDelegate
         model: isAlbum ? songsModel : albumTracksModel.model
+        objectName: "songspage-listview"
         width: parent.width
         header: ListItem.Standard {
             id: albumInfo
@@ -210,32 +212,56 @@
         Component {
             id: albumTracksDelegate
 
-            ListItem.Standard {
+            ListItemWithActions {
                 id: track
+                color: "transparent"
                 objectName: "songspage-track"
                 iconFrame: false
                 progression: false
                 height: styleMusic.common.itemHeight
 
-                MouseArea {
-                    anchors.fill: parent
-                    onDoubleClicked: {
-                    }
-                    onClicked: {
-                        if (focus == false) {
-                            focus = true
-                        }
-
-                        trackClicked(albumtrackslist.model, index)  // play track
-
-                        if (isAlbum && songStackPage.line1 !== "Genre") {
-                            Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
-                            mainView.hasRecent = true
-                            recentModel.filterRecent()
-                        } else if (songStackPage.line1 === "Playlist") {
-                            Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
-                            mainView.hasRecent = true
-                            recentModel.filterRecent()
+                leftSideAction: songStackPage.line1 === "Playlist"
+                                ? playlistRemoveAction.item : null
+                reorderable: songStackPage.line1 === "Playlist"
+                rightSideActions: [
+                    AddToQueue {
+
+                    },
+                    AddToPlaylist {
+
+                    }
+                ]
+                triggerActionOnMouseRelease: true
+
+                onItemClicked: {
+                    trackClicked(albumtrackslist.model, index)  // play track
+
+                    if (isAlbum && songStackPage.line1 !== "Genre") {
+                        Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
+                        mainView.hasRecent = true
+                        recentModel.filterRecent()
+                    } else if (songStackPage.line1 === "Playlist") {
+                        Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
+                        mainView.hasRecent = true
+                        recentModel.filterRecent()
+                    }
+                }
+                onReorder: {
+                    console.debug("Move: ", from, to);
+
+                    Playlists.move(songStackPage.line2, from, to)
+
+                    albumTracksModel.filterPlaylistTracks(songStackPage.line2)
+                }
+
+                Loader {
+                    id: playlistRemoveAction
+                    sourceComponent: Remove {
+                        onTriggered: {
+                            Playlists.removeFromPlaylist(songStackPage.line2, model.i)
+
+                            albumTracksModel.filterPlaylistTracks(songStackPage.line2)
+                            playlistModel.filterPlaylists()
                         }
                     }
                 }
@@ -268,23 +294,6 @@
                     }
                 }
 
-                Expander {
-                    id: expandable
-                    anchors {
-                        fill: parent
-                    }
-                    listItem: track
-                    model: isAlbum ? albumtrackslist.model.get(index, albumTracksModel.model.RoleModelData) : albumtrackslist.model.get(index)
-                    row: Row {
-                        AddToPlaylist {
-
-                        }
-                        AddToQueue {
-
-                        }
-                    }
-                }
-
                 Component.onCompleted: {
                     if (model.date !== undefined)
                     {

=== modified file 'music-app.qml'
--- music-app.qml	2014-08-07 14:15:05 +0000
+++ music-app.qml	2014-08-11 00:34:14 +0000
@@ -370,8 +370,8 @@
     property var chosenElement: null
     property bool toolbarShown: musicToolbar.shown
     property bool selectedAlbum: false
-    signal collapseExpand();
-    signal collapseSwipeDelete(int index);
+
+    signal listItemSwiping(int i)
     signal onToolbarShownChanged(bool shown, var currentPage, var currentTab)
 
     property bool wideAspect: width >= units.gu(70) && loadedUI
@@ -460,8 +460,6 @@
         else {
             player.source = file;
         }
-
-        collapseExpand();  // collapse all expands if track clicked
     }
 
     function trackQueueClick(index) {

=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2014-06-18 20:26:07 +0000
+++ po/com.ubuntu.music.pot	2014-08-11 00:34:14 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-17 13:05-0400\n"
+"POT-Creation-Date: 2014-08-11 01:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -54,74 +54,82 @@
 msgid "You forgot to set your username and/or password"
 msgstr ""
 
-#: ../MusicAlbums.qml:37 ../MusicStart.qml:370
+#: ../MusicAlbums.qml:37 ../MusicStart.qml:378
 msgid "Albums"
 msgstr ""
 
+#: ../MusicAlbums.qml:155 ../MusicStart.qml:202 ../MusicStart.qml:440
+#: ../common/AlbumsPage.qml:276
+msgid "Album"
+msgstr ""
+
 #: ../MusicArtists.qml:37
 msgid "Artists"
 msgstr ""
 
-#: ../MusicArtists.qml:153 ../common/AlbumsSheet.qml:124
+#: ../MusicArtists.qml:107 ../common/AlbumsPage.qml:111
 #, qt-format
 msgid "%1 album"
 msgid_plural "%1 albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../MusicArtists.qml:170 ../MusicPlaylists.qml:187 ../MusicStart.qml:351
-#: ../common/SongsSheet.qml:144
+#: ../MusicArtists.qml:113 ../MusicPlaylists.qml:174 ../MusicStart.qml:359
+#: ../MusicaddtoPlaylist.qml:102 ../common/SongsPage.qml:123
 #, qt-format
 msgid "%1 song"
 msgid_plural "%1 songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../MusicNowPlaying.qml:34
+#: ../MusicArtists.qml:123
+msgid "Artist"
+msgstr ""
+
+#: ../MusicNowPlaying.qml:33
 msgid "Now Playing"
 msgstr ""
 
 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
 #. Remember to keep the translation short to fit the screen width
-#: ../MusicPlaylists.qml:39
+#: ../MusicPlaylists.qml:37
 msgid "Playlists"
 msgstr ""
 
+#: ../MusicPlaylists.qml:47 ../MusicaddtoPlaylist.qml:48
+msgid "New playlist"
+msgstr ""
+
 #. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
-#: ../MusicPlaylists.qml:60
+#: ../MusicPlaylists.qml:63
 msgid "Change name"
 msgstr ""
 
-#: ../MusicPlaylists.qml:61
+#: ../MusicPlaylists.qml:64
 msgid "Enter the new name of the playlist."
 msgstr ""
 
-#: ../MusicPlaylists.qml:72
+#: ../MusicPlaylists.qml:77
 msgid "Change"
 msgstr ""
 
-#: ../MusicPlaylists.qml:85
-msgid "You didn't type in a name."
-msgstr ""
-
-#: ../MusicPlaylists.qml:90 ../MusicPlaylists.qml:116 ../music-app.qml:752
+#: ../MusicPlaylists.qml:95 ../music-app.qml:732
+msgid "Playlist already exists"
+msgstr ""
+
+#: ../MusicPlaylists.qml:99 ../music-app.qml:737
+msgid "Please type in a name."
+msgstr ""
+
+#: ../MusicPlaylists.qml:104 ../music-app.qml:743
 msgid "Cancel"
 msgstr ""
 
-#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
-#: ../MusicPlaylists.qml:103
-msgid "Are you sure?"
-msgstr ""
-
-#: ../MusicPlaylists.qml:104
-msgid "This will delete your playlist."
-msgstr ""
-
-#: ../MusicPlaylists.qml:107
-msgid "Remove"
-msgstr ""
-
-#: ../MusicSearch.qml:44 ../MusicToolbar.qml:508 ../music-app.qml:94
+#: ../MusicPlaylists.qml:161 ../MusicStart.qml:202
+msgid "Playlist"
+msgstr ""
+
+#: ../MusicSearch.qml:44 ../MusicToolbar.qml:519 ../music-app.qml:94
 #: ../music-app.qml:142 ../music-app.qml:148
 msgid "Search"
 msgstr ""
@@ -212,81 +220,87 @@
 msgid "Clean everything!"
 msgstr ""
 
-#: ../MusicStart.qml:37 ../music-app.qml:373 ../music-app.qml:767
+#: ../MusicStart.qml:37 ../music-app.qml:363 ../music-app.qml:909
 #: com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
 msgstr ""
 
-#: ../MusicStart.qml:84
+#: ../MusicStart.qml:77
 msgid "Recent"
 msgstr ""
 
-#: ../MusicStart.qml:112
+#: ../MusicStart.qml:105
 msgid "Clear History"
 msgstr ""
 
-#: ../MusicStart.qml:222
+#: ../MusicStart.qml:224
 msgid "Genres"
 msgstr ""
 
-#: ../MusicToolbar.qml:739
+#: ../MusicStart.qml:309
+msgid "Genre"
+msgstr ""
+
+#: ../MusicToolbar.qml:756
 msgid "No songs queued"
 msgstr ""
 
-#: ../MusicToolbar.qml:749
+#: ../MusicToolbar.qml:766
 msgid "Tap play or any item to start"
 msgstr ""
 
-#: ../MusicTracks.qml:37
+#: ../MusicTracks.qml:35
 msgid "Songs"
 msgstr ""
 
-#: ../MusicaddtoPlaylist.qml:39 ../common/ExpanderItems/AddToPlaylist.qml:59
-#: ../music-app.qml:699
+#: ../MusicaddtoPlaylist.qml:41
 msgid "Select playlist"
 msgstr ""
 
-#: ../MusicaddtoPlaylist.qml:131
-msgid "New playlist"
-msgstr ""
-
-#: ../common/AlbumsSheet.qml:180 ../common/AlbumsSheet.qml:382
-#: ../common/SongsSheet.qml:173
+#: ../common/AlbumsPage.qml:165 ../common/AlbumsPage.qml:357
+#: ../common/SongsPage.qml:152
 msgid "Play all"
 msgstr ""
 
-#: ../common/AlbumsSheet.qml:228 ../common/AlbumsSheet.qml:427
-#: ../common/ExpanderItems/AddToQueue.qml:45 ../common/SongsSheet.qml:225
-#: ../music-app.qml:674
+#: ../common/AlbumsPage.qml:209 ../common/AlbumsPage.qml:397
+#: ../common/SongsPage.qml:199 ../music-app.qml:665
 msgid "Add to queue"
 msgstr ""
 
-#: ../common/AlbumsSheet.qml:352 ../common/SongsSheet.qml:143
+#: ../common/AlbumsPage.qml:327 ../common/SongsPage.qml:122
 #, qt-format
 msgid " | %1 song"
 msgid_plural " | %1 songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../common/ExpanderItems/AddToPlaylist.qml:47 ../music-app.qml:688
+#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:679
 msgid "Add to playlist"
 msgstr ""
 
+#: ../common/ListItemActions/AddToQueue.qml:25
+msgid "Add to Queue"
+msgstr ""
+
 #. TRANSLATORS: this refers to deleting a playlist
-#: ../common/ExpanderItems/DeletePlaylist.qml:48
+#: ../common/ListItemActions/DeletePlaylist.qml:26
 msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: this refers to editing a playlist
-#: ../common/ExpanderItems/EditPlaylist.qml:48
+#: ../common/ListItemActions/EditPlaylist.qml:26
 msgid "Edit"
 msgstr ""
 
+#: ../common/ListItemActions/Remove.qml:27
+msgid "Remove"
+msgstr ""
+
 #: ../common/LoadingSpinnerComponent.qml:44
 msgid "Loading..."
 msgstr ""
 
-#: ../common/SwipeDelete.qml:51 ../common/SwipeDelete.qml:86
+#: ../common/SwipeDelete.qml:52 ../common/SwipeDelete.qml:88
 msgid "Clear"
 msgstr ""
 
@@ -355,42 +369,34 @@
 msgstr ""
 
 #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
-#: ../music-app.qml:288
+#: ../music-app.qml:278
 msgid "songs played today"
 msgstr ""
 
-#: ../music-app.qml:289
+#: ../music-app.qml:279
 msgid "No songs played today"
 msgstr ""
 
-#: ../music-app.qml:396
+#: ../music-app.qml:387
 msgid "Debug: "
 msgstr ""
 
-#: ../music-app.qml:712
+#: ../music-app.qml:701
 msgid "New Playlist"
 msgstr ""
 
-#: ../music-app.qml:713
+#: ../music-app.qml:702
 msgid "Name your playlist."
 msgstr ""
 
-#: ../music-app.qml:717
+#: ../music-app.qml:706
 msgid "Name"
 msgstr ""
 
-#: ../music-app.qml:725
+#: ../music-app.qml:716
 msgid "Create"
 msgstr ""
 
-#: ../music-app.qml:741
-msgid "Error: "
-msgstr ""
-
-#: ../music-app.qml:746
-msgid "Error: You didn't type a name."
-msgstr ""
-
 #: com.ubuntu.music_music.desktop.in.in.h:2
 msgid "A music application for Ubuntu"
 msgstr ""

=== modified file 'tests/autopilot/music_app/emulators.py'
--- tests/autopilot/music_app/emulators.py	2014-08-06 00:51:56 +0000
+++ tests/autopilot/music_app/emulators.py	2014-08-11 00:34:14 +0000
@@ -70,13 +70,23 @@
         albumartist = self.get_albums_albumartist(artistName)
         self.pointing_device.click_object(albumartist)
 
-        # get track item to add to queue
-        trackicon = self.get_songs_page_listview_trackicon(trackTitle)
-        self.pointing_device.click_object(trackicon)
-
-        # click on Add to queue
-        queueTrackLabel = self.get_songs_page_queuetrack_label()
-        self.pointing_device.click_object(queueTrackLabel)
+        # get track item to swipe and queue
+        trackitem = self.get_songs_page_listview_tracktitle(trackTitle)
+        songspage = self.get_songs_page_listview()
+
+        # get coordinates to swipe
+        start_x = int(songspage.globalRect.x +
+                      (songspage.globalRect.width * 0.9))
+        stop_x = int(songspage.globalRect.x)
+        line_y = int(trackitem.globalRect.y)
+
+        # swipe to add to queue
+        self.pointing_device.move(start_x, line_y)
+        self.pointing_device.drag(start_x, line_y, stop_x, line_y)
+
+        # click on add to queue
+        queueaction = self.get_add_to_queue_action()
+        self.pointing_device.click_object(queueaction)
 
     def tap_new_playlist_action(self):
         header = self.get_header()
@@ -125,6 +135,16 @@
             if item.text == artistName:
                 return item
 
+    def get_add_to_queue_action(self):
+        return self.wait_select_single("*",
+                                       objectName="addToQueueAction",
+                                       primed=True)
+
+    def get_add_to_playlist_action(self):
+        return self.wait_select_single("*",
+                                       objectName="addToPlaylistAction",
+                                       primed=True)
+
     def get_add_to_queue_button(self):
         return self.wait_select_single("QQuickImage",
                                        objectName="albumpage-queue-all")
@@ -174,27 +194,6 @@
             if item.text == trackTitle:
                 return item
 
-    def get_album_page_listview_trackicon(self, trackTitle):
-        tracktitle = self.get_album_page_listview_tracktitle(trackTitle)
-        tracktitle_position = tracktitle.globalRect[1]
-        trackicons = self.select_many(
-            "QQuickImage", objectName="expanditem")
-        for item in trackicons:
-            if item.globalRect[1] == tracktitle_position:
-                return item
-
-    def get_songs_page_listview_trackicon(self, trackTitle):
-        tracktitle = self.get_songs_page_listview_tracktitle(trackTitle)
-
-        return self.get_trackimage_from_label(tracktitle)
-
-    def get_songs_page_queuetrack_label(self):
-        queuetracks = self.select_many_retry(
-            "Label", objectName="queuetrack")
-        for item in queuetracks:
-            if item.visible:
-                return item
-
     def get_queue_track_count(self):
         queuelist = self.select_single(
             "QQuickListView", objectName="queuelist")
@@ -214,6 +213,14 @@
             if item.text == trackTitle:
                 return item
 
+    def get_tracks_tab_listview(self):
+        return self.select_single("QQuickListView",
+                                  objectName="trackstab-listview")
+
+    def get_songs_page_listview(self):
+        return self.select_single("QQuickListView",
+                                  objectName="songspage-listview")
+
     def get_songs_tab_tracktitle(self, trackTitle):
         tracktitles = self.select_many_retry(
             "Label", objectName="tracktitle")
@@ -221,29 +228,6 @@
             if item.text == trackTitle:
                 return item
 
-    def get_songs_tab_trackimage(self, trackTitle):
-        tracktitle = self.get_songs_tab_tracktitle(trackTitle)
-
-        return self.get_trackimage_from_label(tracktitle)
-
-    def get_trackimage_from_label(self, label):
-        item = label.get_parent().get_parent().get_parent().get_parent()
-        return item.select_single('QQuickImage', objectName='expanditem')
-
-    def get_songs_tab_add_to_queue_label(self):
-        addtoqueue = self.select_many(
-            "Label", objectName="queuetrack")
-        for item in addtoqueue:
-            if item.visible:
-                return item
-
-    def get_songs_tab_add_to_playlist_label(self):
-        addtoplaylist = self.select_many(
-            "Label", objectName="addtoplaylist")
-        for item in addtoplaylist:
-            if item.visible:
-                return item
-
     def get_newPlaylistDialog_createButton(self):
         return self.wait_select_single(
             "Button", objectName="newPlaylistDialog_createButton")
@@ -253,7 +237,7 @@
             "TextField", objectName="playlistnameTextfield")
 
     def get_addtoplaylistview(self):
-        return self.select_many_retry(
+        return self.wait_select_single(
             "QQuickListView", objectName="addtoplaylistview")
 
     def get_playlistname(self, playlistname):
@@ -272,6 +256,6 @@
             "MusicNowPlaying", objectName="nowplayingpage")
 
     def get_swipedelete_icon(self):
-        swipedelete = self.wait_select_single(
-            "SwipeDelete", direction="swipingRight")
-        return swipedelete.select_single("Label",  objectName="leftDelete")
+        return self.wait_select_single(
+            "*", objectName="swipeDeleteAction",
+            primed=True)

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-07-24 13:57:08 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-08-11 00:34:14 +0000
@@ -359,7 +359,8 @@
 
         # verify track queue has added one to initial value
         endtracksCount = self.main_view.get_queue_track_count()
-        self.assertThat(endtracksCount, Equals(initialtracksCount + 1))
+        self.assertThat(endtracksCount,
+                        Eventually(Equals(initialtracksCount + 1)))
 
         # Assert that the song added to the list is not playing
         self.assertThat(self.player.currentIndex,
@@ -415,19 +416,32 @@
         # switch to songs tab
         self.main_view.switch_to_tab("trackstab")
 
-        # get track item to add to queue
-        trackitem = self.main_view.get_songs_tab_trackimage(self.trackTitle)
-        self.pointing_device.click_object(trackitem)
-        addtoqueueLabel = self.main_view.get_songs_tab_add_to_queue_label()
-        self.pointing_device.click_object(addtoqueueLabel)
+        # get track item to swipe and queue
+        trackitem = self.main_view.get_songs_tab_tracktitle(self.trackTitle)
+        songspage = self.main_view.get_tracks_tab_listview()
+
+        # get coordinates to swipe
+        start_x = int(songspage.globalRect.x +
+                      (songspage.globalRect.width * 0.9))
+        stop_x = int(songspage.globalRect.x)
+        line_y = int(trackitem.globalRect.y)
+
+        # swipe to add to queue
+        self.pointing_device.move(start_x, line_y)
+        self.pointing_device.drag(start_x, line_y, stop_x, line_y)
+
+        # click on add to queue
+        queueaction = self.main_view.get_add_to_queue_action()
+        self.pointing_device.click_object(queueaction)
 
         # verify track queue has added all songs to initial value
-        endtracksCount = self.main_view.get_queue_track_count()
-        self.assertThat(endtracksCount, Equals(initialtracksCount + 1))
+        endtracksCount = self.main_view.get_queue_track_count
+        self.assertThat(endtracksCount(),
+                        Eventually(Equals(initialtracksCount + 1)))
 
         # Assert that the song added to the list is not playing
         self.assertThat(self.player.currentIndex,
-                        Eventually(NotEquals(endtracksCount)))
+                        Eventually(NotEquals(endtracksCount())))
         self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
 
         # verify song's metadata matches the item added to the Now Playing view
@@ -445,14 +459,29 @@
         # switch to songs tab
         self.main_view.switch_to_tab("trackstab")
 
-        # get track item to add to queue
-        trackitem = self.main_view.get_songs_tab_trackimage(self.trackTitle)
-        self.pointing_device.click_object(trackitem)
-        addtoplaylistLbl = self.main_view.get_songs_tab_add_to_playlist_label()
-        self.pointing_device.click_object(addtoplaylistLbl)
+        # get track item to swipe and queue
+        trackitem = self.main_view.get_songs_tab_tracktitle(self.trackTitle)
+        songspage = self.main_view.get_tracks_tab_listview()
+
+        # get coordinates to swipe
+        start_x = int(songspage.globalRect.x +
+                      (songspage.globalRect.width * 0.9))
+        stop_x = int(songspage.globalRect.x)
+        line_y = int(trackitem.globalRect.y)
+
+        # swipe to add to queue
+        self.pointing_device.move(start_x, line_y)
+        self.pointing_device.drag(start_x, line_y, stop_x, line_y)
+
+        # click on add to playlist
+        playlistaction = self.main_view.get_add_to_playlist_action()
+        self.pointing_device.click_object(playlistaction)
+
+        # Wait for animations to complete
+        playlistaction.primed.wait_for(False)
 
         # get initial list view playlist count
-        playlist_count = self.main_view.get_addtoplaylistview()[0].count
+        playlist_count = self.main_view.get_addtoplaylistview().count
 
         # click on New playlist button in header
         self.main_view.tap_new_playlist_action()
@@ -468,7 +497,7 @@
         self.pointing_device.click_object(createButton)
 
         # verify playlist has been sucessfully created
-        palylist_final_count = self.main_view.get_addtoplaylistview()[0].count
+        palylist_final_count = self.main_view.get_addtoplaylistview().count
         self.assertThat(palylist_final_count, Equals(playlist_count + 1))
         playlist = self.main_view.get_playlistname("myPlaylist")
         self.assertThat(playlist, Not(Is(None)))
@@ -546,15 +575,15 @@
         musicnowplayingpage = self.main_view.get_MusicNowPlaying_page()
 
         # get coordinates to delete song
-        startX = int(musicnowplayingpage.globalRect[0] +
-                     musicnowplayingpage.width * 0.30)
-        stopX = int(musicnowplayingpage.globalRect[0] +
-                    musicnowplayingpage.width)
-        lineY = int(artistToDelete.globalRect[1])
+        start_x = int(musicnowplayingpage.globalRect.x +
+                      musicnowplayingpage.globalRect.width * 0.30)
+        stop_x = int(musicnowplayingpage.globalRect.x +
+                     musicnowplayingpage.globalRect.width * 0.90)
+        line_y = int(artistToDelete.globalRect.y)
 
         # swipe to remove song
-        self.pointing_device.move(startX, lineY)
-        self.pointing_device.drag(startX, lineY, stopX, lineY)
+        self.pointing_device.move(start_x, line_y)
+        self.pointing_device.drag(start_x, line_y, stop_x, line_y)
 
         # click on delete icon/label to confirm removal
         swipedeleteicon = self.main_view.get_swipedelete_icon()
@@ -562,7 +591,8 @@
 
         # verify song has been deleted
         finalqueueCount = self.main_view.get_queue_track_count()
-        self.assertThat(finalqueueCount, Equals(initialqueueCount - 1))
+        self.assertThat(finalqueueCount,
+                        Eventually(Equals(initialqueueCount - 1)))
 
     def test_playback_stops_when_last_song_ends_and_repeat_off(self):
         """Check that playback stops when the last song in the queue ends"""