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

[Kunal Parmar]

Using Loader to load only required page.

Using Loader to load only required page.

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

PASSED: Continuous integration, rev:242
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/387/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2068
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/387
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/387
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/221

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me, I guess you would be required for merging from trunk.

Rest changes looks fine and works.

thank you.

review: Approve

[Kunal Parmar (pkunal-parmar)]

Thanks, merge latest trunk

[Mihir Soni (mihirsoni)]

review: Approve

=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2014-03-26 19:06:27 +0000
+++ TimeLineHeader.qml	2014-04-12 04:07:28 +0000
@@ -45,33 +45,12 @@
         }
 
         function getStartDate() {
+            var indexType = header.indexType(index);
             switch(type) {
             case ViewType.ViewTypeWeek:
-                return getDateForWeek();
+                return date.addDays(7*indexType);
             case ViewType.ViewTypeDay:
-                return getDateForDay();
-            }
-        }
-
-        function getDateForDay() {
-            switch( header.indexType(index)) {
-            case 0:
-                return date;
-            case -1:
-                return date.addDays(-1);
-            case 1:
-                return date.addDays(1);
-            }
-        }
-
-        function getDateForWeek() {
-            switch( header.indexType(index)) {
-            case 0:
-                return date;
-            case -1:
-                return date.addDays(-7);
-            case 1:
-                return date.addDays(7);
+                return date.addDays(1*indexType);
             }
         }
     }

=== modified file 'calendar.qml'
--- calendar.qml	2014-04-11 00:21:42 +0000
+++ calendar.qml	2014-04-12 04:07:28 +0000
@@ -53,7 +53,7 @@
     width: units.gu(100)
     height: units.gu(80)
     focus: true
-    Keys.forwardTo: [yearView,monthView,weekView,dayView,pageStack.currentPage,tabPage]
+    Keys.forwardTo: [pageStack.currentPage]
 
     headerColor: "#266249"
     backgroundColor: "#478158"
@@ -63,10 +63,27 @@
     PageStack {
         id: pageStack
 
-        Component.onCompleted: push(tabPage)
-
-        Page{
-            id: tabPage
+        Component.onCompleted: push(tabs)
+
+        // This is for wait that the app is load when newEvent is invoked by argument
+        Timer {
+            id: timer
+            interval: 200; running: false; repeat: false
+            onTriggered: {
+                tabs.newEvent();
+            }
+        }
+
+        EventListModel{
+            id: eventModel
+            //This model is just for newevent
+            //so we dont need any update
+            autoUpdate: false
+        }
+
+        Tabs{
+            id: tabs
+            Keys.forwardTo: [tabs.currentPage.item]
 
             property var currentDay: DateExt.today();
 
@@ -75,21 +92,6 @@
             property int starttime: -1;
             property int endtime: -1;
 
-            onCurrentDayChanged: {
-                if( yearView.currentYear !== currentDay.getFullYear() ) {
-                    yearView.currentYear = tabPage.currentDay.getFullYear();
-                }
-
-                if( monthView.currentMonth !== undefined && !monthView.currentMonth.isSameDay(currentDay))
-                    monthView.currentMonth = currentDay.midnight();
-
-                if( !dayView.currentDay.isSameDay(currentDay))
-                    dayView.currentDay = currentDay
-
-                if( !weekView.dayStart.isSameDay(currentDay))
-                    weekView.dayStart = currentDay
-            }
-
             function newEvent() {
                 var startDate = new Date();
                 var endDate = new Date();
@@ -125,13 +127,13 @@
                 var difference = endTime - startTime;
 
                 if (difference > month)
-                    return 0;   // Year view
+                    return yearTab.index;   // Year view
                 else if (difference > 7 * day)
-                    return 1;   // Month view}
+                    return monthTab.index;   // Month view}
                 else if (difference > day)
-                    return 2;   // Week view
+                    return weekTab.index;   // Week view
                 else
-                    return 3;   // Day view
+                    return dayTab.index;   // Day view
             }
 
             // This function parse the argument
@@ -153,14 +155,14 @@
                 // If an url has been set
                 if (args.defaultArgument.at(0)) {
                     parseArguments(args.defaultArgument.at(0))
-                    tabPage.currentDay = new Date()
+                    tabs.currentDay = new Date()
                     // If newevent has been called on startup
                     if (newevent) {
                         timer.running = true;
                     }
                     else if (starttime !== -1) { // If no newevent has been setted, but starttime
                         var startTime = parseInt(starttime);
-                        tabPage.currentDay = new Date(startTime);
+                        tabs.currentDay = new Date(startTime);
 
                         // If also endtime has been settend
                         if (endtime !== -1) {
@@ -183,22 +185,6 @@
                 }
             } // End of Component.onCompleted:
 
-            // This is for wait that the app is load when newEvent is invoked by argument
-            Timer {
-                id: timer
-                interval: 200; running: false; repeat: false
-                onTriggered: {
-                    tabPage.newEvent();
-                }
-            }
-
-            EventListModel{
-                id: eventModel
-                //This model is just for newevent
-                //so we dont need any update
-                autoUpdate: false
-            }
-
             ToolbarItems {
                 id: commonToolBar
 
@@ -208,7 +194,11 @@
                         iconSource: Qt.resolvedUrl("calendar-today.svg");
                         text: i18n.tr("Today");
                         onTriggered: {
-                            tabPage.currentDay = (new Date()).midnight();
+                            tabs.currentDay = (new Date()).midnight();
+                            if(yearViewLoader.item ) yearViewLoader.item.currentYear = tabs.currentDay.getFullYear();
+                            if(monthViewLoader.item ) monthViewLoader.item.currentMonth = tabs.currentDay.midnight();
+                            if(weekViewLoader.item ) weekViewLoader.item.dayStart = tabs.currentDay;
+                            if(dayViewLoader.item ) dayViewLoader.item.currentDay = tabs.currentDay;
                         }
                     }
                 }
@@ -218,7 +208,7 @@
                         iconSource: Qt.resolvedUrl("new-event.svg");
                         text: i18n.tr("New Event");
                         onTriggered: {
-                            pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"date":tabPage.currentDay,"model":eventModel});
+                            pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"date":tabs.currentDay,"model":eventModel});
                         }
                     }
                 }
@@ -246,78 +236,129 @@
                 }
             }
 
-            Tabs{
-                id: tabs
-
-                Tab{
-                    id: yearTab
-                    objectName: "yearTab"
-                    title: i18n.tr("Year")
-                    page: YearView{
-                        id: yearView
-                        objectName: "yearPage"
-                        tools: commonToolBar
-                        anchors.fill: parent
+            Tab{
+                id: yearTab
+                objectName: "yearTab"
+                title: i18n.tr("Year")
+                page: Loader{
+                    id: yearViewLoader
+                    objectName: "yearViewLoader"
+                    source: tabs.selectedTab == yearTab ? Qt.resolvedUrl("YearView.qml"):""
+                    onLoaded: {
+                        item.tools = Qt.binding(function() { return commonToolBar })
+                        item.currentYear = tabs.currentDay.getFullYear();
+                    }
+
+                    anchors{
+                        left: parent.left
+                        right: parent.right
+                        bottom: parent.bottom
+                    }
+
+                    Connections{
+                        target: yearViewLoader.item
                         onMonthSelected: {
-                            tabs.selectedTabIndex = 1
                             var now = DateExt.today();
                             if( date.getMonth() === now.getMonth()
                                     && date.getFullYear() === now.getFullYear()) {
-                                monthView.currentMonth = now
+                                tabs.currentDay = now;
                             } else {
-                                monthView.currentMonth = date.midnight();
+                                tabs.currentDay = date.midnight();
                             }
+                            tabs.selectedTabIndex = monthTab.index;
                         }
                     }
                 }
-                Tab {
-                    id: monthTab
-                    objectName: "monthTab"
-                    title: i18n.tr("Month")
-                    page: MonthView{
-                        anchors.fill: parent
-                        tools: commonToolBar
-                        id: monthView
-
+            }
+
+            Tab{
+                id: monthTab
+                objectName: "monthTab"
+                title: i18n.tr("Month")
+                page: Loader{
+                    id: monthViewLoader
+                    objectName: "monthViewLoader"
+                    source: tabs.selectedTab == monthTab ? Qt.resolvedUrl("MonthView.qml"):""
+                    onLoaded: {
+                        item.tools = Qt.binding(function() { return commonToolBar })
+                        item.currentMonth = tabs.currentDay.midnight();
+                        print("onLoaded:"+ tabs.currentDay);
+                    }
+
+                    anchors{
+                        left: parent.left
+                        right: parent.right
+                        bottom: parent.bottom
+                    }
+
+                    Connections{
+                        target: monthViewLoader.item
                         onDateSelected: {
-                            tabs.selectedTabIndex  = 3
-                            tabPage.currentDay = date;
+                            tabs.currentDay = date;
+                            tabs.selectedTabIndex = dayTab.index;
                         }
                     }
                 }
-                Tab{
-                    id: weekTab
-                    objectName: "weekTab"
-                    title: i18n.tr("Week")
-                    page: WeekView{
-                        id: weekView
-                        anchors.fill: parent
-                        tools: commonToolBar
-                        isCurrentPage: tabs.selectedTab == weekTab
-
+            }
+
+            Tab{
+                id: weekTab
+                objectName: "weekTab"
+                title: i18n.tr("Week")
+                page: Loader{
+                    id: weekViewLoader
+                    objectName: "weekViewLoader"
+                    source: tabs.selectedTab == weekTab ? Qt.resolvedUrl("WeekView.qml"):""
+                    onLoaded: {
+                        item.tools = Qt.binding(function() { return commonToolBar })
+                        item.isCurrentPage= Qt.binding(function() { return tabs.selectedTab == weekTab })
+                        item.dayStart = tabs.currentDay;
+                    }
+
+                    anchors{
+                        left: parent.left
+                        right: parent.right
+                        bottom: parent.bottom
+                    }
+
+                    Connections{
+                        target: weekViewLoader.item
                         onDayStartChanged: {
-                            tabPage.currentDay = dayStart;
+                            tabs.currentDay = weekViewLoader.item.dayStart;
                         }
 
                         onDateSelected: {
-                            tabs.selectedTabIndex = 3;
-                            tabPage.currentDay = date;
+                            tabs.currentDay = date;
+                            tabs.selectedTabIndex = dayTab.index;
                         }
                     }
                 }
-
-                Tab{
-                    id: dayTab
-                    objectName: "dayTab"
-                    title: i18n.tr("Day")
-                    page: DayView{
-                        id: dayView
-                        anchors.fill: parent
-                        tools: commonToolBar
-                        isCurrentPage: tabs.selectedTab == dayTab
-
+            }
+
+            Tab{
+                id: dayTab
+                objectName: "dayTab"
+                title: i18n.tr("Day")
+                page: Loader{
+                    id: dayViewLoader
+                    objectName: "dayViewLoader"
+                    source: tabs.selectedTab == dayTab ? Qt.resolvedUrl("DayView.qml"):""
+                    onLoaded: {
+                        item.tools = Qt.binding(function() { return commonToolBar })
+                        item.isCurrentPage= Qt.binding(function() { return tabs.selectedTab == dayTab })
+                        item.currentDay = tabs.currentDay;
+                    }
+
+                    anchors{
+                        left: parent.left
+                        right: parent.right
+                        bottom: parent.bottom
+                    }
+
+                    Connections{
+                        target: dayViewLoader.item
                         onCurrentDayChanged: {
-                            tabPage.currentDay = currentDay;
+                            tabs.currentDay = dayViewLoader.item.currentDay;
                         }
                     }
                 }

=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/calendar_app/tests/test_calendar.py	2014-03-20 03:02:48 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2014-04-12 04:07:28 +0000
@@ -92,5 +92,6 @@
 
         #verify that the event has been created in timeline
         self.main_view.open_toolbar().click_button("todaybutton")
+        self.main_view.switch_to_tab("dayTab")
         self.assertThat(self.main_view.get_num_events,
                         Eventually(NotEquals(num_events)))