Merge lp:~pkunal-parmar/ubuntu-calendar-app/WeekView-Scrolling into lp:ubuntu-calendar-app

[Kunal Parmar]

Changed week view scrolling to resolve Bug #1473682

Changed week view scrolling to resolve Bug #1473682

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

PASSED: Continuous integration, rev:712
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1231/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/228

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1231/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:712
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/5/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/43/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Seems like some jenkins issue "jenkins job parameter [use_description_for_commit]: not found"

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:714
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/13/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/89/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/13/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:714
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1237/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/234

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1237/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-autolanding/3/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/137/console

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks like a simple merge conflict.

[lp:~pkunal-parmar/ubuntu-calendar-app/WeekView-Scrolling]

715. By Kunal Parmar on 2015-11-29

merge from trunk

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:715
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/21/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/201/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/21/rebuild

review: Approve (continuous-integration)

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2015-05-08 02:03:36 +0000
+++ EventBubble.qml	2015-11-29 03:17:46 +0000
@@ -221,8 +221,8 @@
         anchors.fill: parent
         drag.target: isLiveEditing ? infoBubble : null
         drag.axis: Drag.YAxis
-        drag.minimumY: flickable === null? 0: flickable.y
-        drag.maximumY: flickable === null? 0 :flickable.contentHeight - infoBubble.height
+        drag.minimumY: flickable ? flickable.y : 0
+        drag.maximumY: flickable ? flickable.contentHeight - infoBubble.height : infoBubble.height
         onReleased: parent.Drag.drop()
         onClicked: {
             if( isLiveEditing ) {

=== modified file 'PathViewBase.qml'
--- PathViewBase.qml	2014-09-20 10:45:35 +0000
+++ PathViewBase.qml	2015-11-29 03:17:46 +0000
@@ -51,6 +51,23 @@
         return 1;
     }
 
+    function swipeDirection() {
+
+        if( intern.previousIndex == 0 && currentIndex == count - 1) {
+            return -1;
+        }
+
+        if( intern.previousIndex == count-1 && currentIndex == 0) {
+            return 1;
+        }
+
+        if(currentIndex > intern.previousIndex ){
+            return 1;
+        } else {
+            return -1;
+        }
+    }
+
     Keys.onLeftPressed:{
         root.decrementCurrentIndex();
     }

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2015-09-05 05:30:23 +0000
+++ TimeLineBaseComponent.qml	2015-11-29 03:17:46 +0000
@@ -74,7 +74,13 @@
                 timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
             }
         } else {
-            timeLineView.contentX = 0;
+            //need to check swipe direction
+            //and change startion position as per direction
+            if(weekViewPath.swipeDirection() === -1) {
+                timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
+            } else {
+                timeLineView.contentX = 0;
+            }
         }
     }