Merge lp:~ahayzen/music-app/remix-fix-listitemactions-highlight-reordering into lp:music-app/remix

[Andrew Hayzen]

* Fix for highlight in listitem with actons bleeding into the actions background
* Fix for reordering never being enabled

* Fix for highlight in listitem with actons bleeding into the actions background
* Fix for reordering never being enabled

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

PASSED: Continuous integration, rev:741
http://91.189.93.70:8080/job/music-app-remix-ci/268/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/225
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/225/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/43

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:741
http://91.189.93.70:8080/job/music-app-ci/1150/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/226
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/226/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/2

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-fix-listitemactions-highlight-reordering]

742. By Andrew Hayzen on 2014-11-15

* Remove reordering property as it isn't used anymore

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

PASSED: Continuous integration, rev:742
http://91.189.93.70:8080/job/music-app-remix-ci/270/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/229
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/45

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:742
http://91.189.93.70:8080/job/music-app-ci/1152/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/230
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/230/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/4

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Now that we are re-adding the reorder support. I'd like the items to have background color as they are reordered. I've never liked how it appears as though just the text is being moved. I think the following is the proper way to do this:

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml 2014-11-07 22:51:16 +0000
+++ MusicNowPlaying.qml 2014-11-15 21:41:44 +0000
@@ -574,7 +574,7 @@
                 id: queueDelegate
                 ListItemWithActions {
                     id: queueListItem
- color: player.currentIndex === index ? "#2c2c34" : "transparent"
+ color: player.currentIndex === index ? "#2c2c34" : mainView.backgroundColor
                     height: queueList.normalHeight
                     objectName: "nowPlayingListItem" + index
                     state: ""

review: Needs Fixing

[lp:~ahayzen/music-app/remix-fix-listitemactions-highlight-reordering]

743. By Andrew Hayzen on 2014-11-15

* Fix so that now playing not current tracks have background when reordering

[Andrew Hayzen (ahayzen)]

Fixed, please retest :)

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

PASSED: Continuous integration, rev:743
http://91.189.93.70:8080/job/music-app-ci/1155/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/236
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/7

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-11-07 22:51:16 +0000
+++ MusicNowPlaying.qml	2014-11-15 22:22:02 +0000
@@ -574,7 +574,7 @@
                 id: queueDelegate
                 ListItemWithActions {
                     id: queueListItem
-                    color: player.currentIndex === index ? "#2c2c34" : "transparent"
+                    color: player.currentIndex === index ? "#2c2c34" : mainView.backgroundColor
                     height: queueList.normalHeight
                     objectName: "nowPlayingListItem" + index
                     state: ""

=== modified file 'common/ListItemWithActions.qml'
--- common/ListItemWithActions.qml	2014-11-08 00:17:21 +0000
+++ common/ListItemWithActions.qml	2014-11-15 22:22:02 +0000
@@ -46,7 +46,6 @@
     readonly property bool _showActions: mouseArea.pressed || swipeState != "Normal" || swipping
 
     property bool reorderable: false  // CUSTOM
-    property bool reordering: false  // CUSTOM
     property bool multiselectable: false  // CUSTOM
 
     property int previousListItemIndex: -1  // CUSTOM
@@ -61,7 +60,6 @@
     signal reorder(int from, int to)  // CUSTOM
 
     onItemPressAndHold: {
-        //reordering = reorderable && !reordering  // CUSTOM
         if (multiselectable) {
             selectionMode = true
         }
@@ -265,11 +263,6 @@
         onClearSelection: selected = false
         onSelectAll: selected = true
         onStateChanged: selectionMode = root.parent.parent.state === "multiselectable"
-        onVisibleChanged: {
-            if (!visible) {
-                reordering = false
-            }
-        }
     }
 
     Component.onCompleted: {  // CUSTOM
@@ -365,7 +358,6 @@
        anchors {
            top: main.top
            left: main.right
-           leftMargin: reordering ? actionReorder.width : 0  // CUSTOM
            bottom: main.bottom
        }
        visible: _visibleRightSideActions.length > 0
@@ -481,7 +473,7 @@
     Rectangle {
         id: listItemBrighten
         anchors {
-            fill: parent
+            fill: main
         }
 
         color: mouseArea.pressed ? styleMusic.common.white : "transparent"
@@ -498,7 +490,7 @@
             top: parent.top
         }
         asynchronous: true
-        sourceComponent: reordering ? actionReorderComponent : undefined
+        sourceComponent: reorderable && selectionMode && root.parent.parent.selectedItems.length === 0 ? actionReorderComponent : undefined
     }
 
     Component {
@@ -589,7 +581,6 @@
         }
     }
 
-
     SequentialAnimation {
         id: triggerAction
 
@@ -643,7 +634,7 @@
     MouseArea {
         id: mouseArea
 
-        property bool locked: root.locked || ((root.leftSideAction === null) && (root._visibleRightSideActions.count === 0)) || reordering  // CUSTOM
+        property bool locked: root.locked || ((root.leftSideAction === null) && (root._visibleRightSideActions.count === 0))  // CUSTOM
         property bool manual: false
         property string direction: "None"
         property real lastX: -1