address-book-app

Merge lp:~renatofilho/address-book-app/fix-list-with-actions-item into lp:~phablet-team/address-book-app/staging

fix-list-with-actions-item
Merge into staging

Proposed by Renato Araujo Oliveira Filho on 2014-07-10

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2014-07-15
Approved revision:	219
Merged at revision:	220
Proposed branch:	lp:~renatofilho/address-book-app/fix-list-with-actions-item
Merge into:	lp:~phablet-team/address-book-app/staging
Diff against target:	133 lines (+30/-33) 1 file modified src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+30/-33)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/fix-list-with-actions-item
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2014-07-10	Approve on 2014-07-15
PS Jenkins bot	continuous-integration		Approve on 2014-07-14
Review via email: mp+226385@code.launchpad.net

Commit message

Optimized ListItemWithActions.
Fixed right side actions alignment.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/226/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/227/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/fix-list-with-actions-item updated on 2014-07-11

217. By Renato Araujo Oliveira Filho on 2014-07-11: Align the delete intem in the certer.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/230/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/fix-list-with-actions-item updated on 2014-07-11

218. By Renato Araujo Oliveira Filho on 2014-07-11: Increase actions margin.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/233/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/fix-list-with-actions-item updated on 2014-07-14

219. By Renato Araujo Oliveira Filho on 2014-07-14: Make sure the right actions width is 0 if empty.

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-07-14:

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? YES

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGE

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/235/rebuild

review: Approve (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-07-15:

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Renato Araujo Oliveira Filho

Ubuntu Phablet Team

 === modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
 --- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2014-07-05 01:00:05 +0000
 +++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2014-07-14 13:05:20 +0000
@@ -31,6 +31,8 @@
      default property alias contents: main.children
      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
@@ -40,27 +42,20 @@
      function returnToBoundsRTL()
+     {
++        var actionFullWidth = actionWidth + units.gu(2)
          var xOffset = Math.abs(main.x)
--        var actionFullWidth = actionWidth + units.gu(1)
++        var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
--        if (xOffset < actionFullWidth) {
++        if (index < 1) {
              main.x = 0
--        } else if (xOffset > (actionFullWidth * rightActionsRepeater.count)) {
--            main.x = - (actionFullWidth * rightActionsRepeater.count)
          } else {
--            for (var i = rightActionsRepeater.count; i >= 2; i--) {
--                if (xOffset >= (actionFullWidth * i)) {
--                    main.x = -(actionWidth * i)
--                    return
--                }
--            }
--            main.x = -actionWidth
++            main.x = -(actionFullWidth * index)
+         }
+     }
      function returnToBoundsLTR()
+     {
--        var finalX = leftActionView.width
++        var finalX = leftActionWidth
          if (main.x > (finalX * root.threshold))
              main.x = finalX
          else
@@ -99,16 +94,14 @@
      function updateActiveAction()
+     {
--        var xOffset = Math.abs(main.x)
--        if (main.x < 0) {
--            for (var i = rightActionsRepeater.count - 1; i >= 0; i--) {
--                var child = rightActionsRepeater.itemAt(i)
--                var childOffset = rightActionsView.width - child.x
--                if (xOffset <= childOffset) {
--                    root.activeItem = child
--                    root.activeAction = root.rightSideActions[i]
--                    return
--                }
++        if (main.x <= -root.actionWidth) {
++            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
@@ -129,14 +122,17 @@
          anchors {
              top: parent.top
              bottom: parent.bottom
--            left: parent.left
++            right: main.left
+         }
--        width: height
++        width: root.leftActionWidth + actionThreshold
          visible: leftSideAction
          color: "red"
          Icon {
--            anchors.centerIn: parent
++            anchors {
++                centerIn: parent
++                horizontalCenterOffset: actionThreshold / 2
++            }
              name: leftSideAction ? leftSideAction.iconName : ""
              color: Theme.palette.selected.field
              height: units.gu(3)
@@ -149,13 +145,14 @@
         anchors {
             top: main.top
--           right: parent.right
++           left: main.right
++           leftMargin: units.gu(1)
             bottom: main.bottom
+        }
--       width: rightActionsRepeater.count * (root.actionWidth + units.gu(1))
++       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + actionThreshold : 0
         Row {
             anchors.fill: parent
--           spacing: units.gu(1)
++           spacing: units.gu(2)
             Repeater {
                 id: rightActionsRepeater
@@ -227,11 +224,6 @@
                  easing {type: Easing.InOutBack; }
+             }
+         }
--        ScriptAction {
--            script: {
--                root.activeAction.triggered(root)
--            }
--        }
          PropertyAction {
              target: triggerAction.currentItem
              properties: "width, height"
@@ -249,6 +241,11 @@
              easing.type: Easing.OutElastic
              duration: UbuntuAnimation.SlowDuration
+         }
++        ScriptAction {
++            script: {
++                root.activeAction.triggered(root)
++            }
++        }
+     }
      MouseArea {

address-book-app

Merge lp:~renatofilho/address-book-app/fix-list-with-actions-item into lp:~phablet-team/address-book-app/staging

Commit message

Description of the change

Preview Diff

Subscribers