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

[Kunal Parmar]

Resolves Bug #1295068,Bug #1294679,

When Week or day tab is selected, view scrolls to current time

When inside week or day view when user changes the week or day, keep current scrolled time

Resolves Bug #1295068,Bug #1294679,

When Week or day tab is selected, view scrolls to current time

When inside week or day view when user changes the week or day, keep current scrolled time

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

PASSED: Continuous integration, rev:218
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/333/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1839
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/333
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/333
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/167

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me.

Thank you for your MR.

review: Approve

=== modified file 'DayView.qml'
--- DayView.qml	2014-03-19 19:46:58 +0000
+++ DayView.qml	2014-03-22 04:47:27 +0000
@@ -9,6 +9,7 @@
     objectName: "DayView"
 
     property var currentDay: new Date()
+    property bool isCurrentPage: false
 
     Column {
         id: column
@@ -77,6 +78,15 @@
                 height: parent.height
                 z: index == dayViewPath.currentIndex ? 2 : 1
 
+                Connections{
+                    target: root
+                    onIsCurrentPageChanged:{
+                        if(root.isCurrentPage){
+                            timeLineView.scrollToCurrentTime();
+                        }
+                    }
+                }
+
                 //get contentY value from PathView, if its not current Item
                 Binding{
                     target: timeLineView
 
=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-01-31 03:20:40 +0000
+++ TimeLineBaseComponent.qml	2014-03-22 04:47:27 +0000
@@ -15,13 +15,16 @@
 
     property int type: ViewType.ViewTypeWeek
 
-    onStartDayChanged: {
-        timeLineView.scroll();
-    }
+    function scrollToCurrentTime() {
+        //scroll to current time
+        var currentTime = new Date();
+        //TODO: if current time is early morning should we show time from 9 am ?
+        var hour = currentTime.getHours();
 
-    //scroll in case content height changed
-    onHeightChanged: {
-        timeLineView.scroll()
+        timeLineView.contentY = hour * units.gu(10);
+        if(timeLineView.contentY >= timeLineView.contentHeight - timeLineView.height) {
+            timeLineView.contentY = timeLineView.contentHeight - timeLineView.height
+        }
     }
 
     Column {
@@ -47,16 +50,6 @@
 
             clip: true
 
-            function scroll() {
-                //scroll to 9 o'clock
-                var hour = 9
-
-                timeLineView.contentY = hour * units.gu(10);
-                if(timeLineView.contentY >= timeLineView.contentHeight - timeLineView.height) {
-                    timeLineView.contentY = timeLineView.contentHeight - timeLineView.height
-                }
-            }
-
             TimeLineBackground{
             }
 
 
=== modified file 'WeekView.qml'
--- WeekView.qml	2014-03-19 19:46:58 +0000
+++ WeekView.qml	2014-03-22 04:47:27 +0000
@@ -10,6 +10,8 @@
 
     property var dayStart: new Date();
     property var firstDay: dayStart.weekStart(Qt.locale().firstDayOfWeek);
+    property bool isCurrentPage: false
+
     anchors.top: parent.top
     anchors.topMargin: units.gu(1.5)
     spacing: units.gu(1)
@@ -37,6 +39,9 @@
         width: parent.width
         height: root.height - weekViewPath.y
 
+        //This is used to scroll all view together when currentItem scrolls
+        property var childContentY;
+
         onNextItemHighlighted: {
             nextWeek();
             weekHeader.incrementCurrentIndex()
@@ -66,6 +71,31 @@
             height: parent.height
             startDay: getWeekStart();
 
+            Connections{
+                target: root
+                onIsCurrentPageChanged:{
+                    if(root.isCurrentPage){
+                        timeLineView.scrollToCurrentTime();
+                    }
+                }
+            }
+
+            //get contentY value from PathView, if its not current Item
+            Binding{
+                target: timeLineView
+                property: "contentY"
+                value: weekViewPath.childContentY;
+                when: !timeLineView.PathView.isCurrentItem
+            }
+
+            //set PathView's contentY property, if its current item
+            Binding{
+                target: weekViewPath
+                property: "childContentY"
+                value: contentY
+                when: timeLineView.PathView.isCurrentItem
+            }
+
             function getWeekStart() {
                 switch( weekViewPath.indexType(index)) {
                 case 0:
 
=== modified file 'calendar.qml'
--- calendar.qml	2014-03-19 19:46:58 +0000
+++ calendar.qml	2014-03-22 04:47:27 +0000
@@ -233,6 +233,7 @@
 
             Tabs{
                 id: tabs
+
                 Tab{
                     objectName: "yearTab"
                     title: i18n.tr("Year")
@@ -270,6 +271,7 @@
                     }
                 }
                 Tab{
+                    id: weekTab
                     objectName: "weekTab"
                     title: i18n.tr("Week")
                     page: Page{
@@ -278,6 +280,7 @@
                         WeekView{
                             id: weekView
                             anchors.fill: parent
+                            isCurrentPage: tabs.selectedTab == weekTab
 
                             onDayStartChanged: {
                                 tabPage.currentDay = dayStart;
@@ -287,6 +290,7 @@
                 }
 
                 Tab{
+                    id: dayTab
                     objectName: "dayTab"
                     title: i18n.tr("Day")
                     page: Page{
@@ -295,6 +299,7 @@
                         DayView{
                             id: dayView
                             anchors.fill: parent
+                            isCurrentPage: tabs.selectedTab == dayTab
 
                             onCurrentDayChanged: {
                                 tabPage.currentDay = currentDay;