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

[Kunal Parmar]

Loading Event indicator using Loader in monthView and other minor changes

Loading Event indicator using Loader in monthView and other minor changes

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

PASSED: Continuous integration, rev:258
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/415/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2228
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/415
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/415
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/249

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

LGTM.
Thanks kunal

review: Approve

=== modified file 'DayView.qml'
--- DayView.qml	2014-04-11 00:21:42 +0000
+++ DayView.qml	2014-04-26 05:02:19 +0000
@@ -108,18 +108,7 @@
 
                 contentInteractive: timeLineView.PathView.isCurrentItem
 
-                startDay: getStartDay()
-
-                function getStartDay() {
-                    switch( dayViewPath.indexType(index)) {
-                    case 0:
-                        return dayViewPath.startDay;
-                    case -1:
-                        return dayViewPath.startDay.addDays(-1);
-                    case 1:
-                        return dayViewPath.startDay.addDays(1);
-                    }
-                }
+                startDay: dayViewPath.startDay.addDays(dayViewPath.indexType(index))
             }
         }
     }

=== modified file 'EventListModel.qml'
--- EventListModel.qml	2014-04-05 04:49:47 +0000
+++ EventListModel.qml	2014-04-26 05:02:19 +0000
@@ -11,6 +11,13 @@
         listeners.push(listener);
     }
 
+    function removeModelChangeListener(listener) {
+        var i = listeners.indexOf(listener);
+        if(i != -1) {
+            listeners.splice(i, 1);
+        }
+    }
+
     function getItems(startDate, endDate){
         return itemsByTimePeriod(startDate,endDate);
     }

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2014-04-19 21:46:54 +0000
+++ MonthComponent.qml	2014-04-26 05:02:19 +0000
@@ -57,7 +57,6 @@
         property int todayMonth: today.getMonth()
         property int todayYear: today.getFullYear()
 
-
         //date from month will start, this date might be from previous month
         property var monthStart: currentMonth.weekStart( Qt.locale().firstDayOfWeek )
         property int monthStartDate: monthStart.getDate()
@@ -210,15 +209,12 @@
                 }
             }
 
-            Rectangle {
-                width: units.gu(1)
-                height: width
-                radius: height/2
-                color:"#5E2750"
-                visible: showEvents
+            Loader{
+                property bool shouldLoad: showEvents
                          && intern.eventStatus !== undefined
                          && intern.eventStatus[index] !== undefined
                          &&intern.eventStatus[index]
+                sourceComponent: shouldLoad ? eventIndicatorComp : undefined
                 anchors.top: dateLabel.bottom
                 anchors.horizontalCenter: dateLabel.horizontalCenter
             }
@@ -251,6 +247,16 @@
     }
 
     Component{
+        id: eventIndicatorComp
+        Rectangle {
+            width: units.gu(1)
+            height: width
+            radius: height/2
+            color:"#5E2750"
+        }
+    }
+
+    Component{
         id: dafaultDayLabelComponent
 
         Label{

=== modified file 'MonthView.qml'
--- MonthView.qml	2014-04-19 21:46:54 +0000
+++ MonthView.qml	2014-04-26 05:02:19 +0000
@@ -51,20 +51,11 @@
             width: parent.width - units.gu(5)
             height: parent.height - units.gu(5)
 
-            currentMonth: getMonthDate();
+            currentMonth: monthViewPath.addMonth(monthViewPath.startMonth,
+                                                 monthViewPath.indexType(index));
+
             isYearView: false
 
-            function getMonthDate() {
-                switch( monthViewPath.indexType(index)) {
-                case 0:
-                    return monthViewPath.addMonth(monthViewPath.startMonth, 0);
-                case -1:
-                    return monthViewPath.addMonth(monthViewPath.startMonth, -1);
-                case 1:
-                    return monthViewPath.addMonth(monthViewPath.startMonth, 1);
-                }
-            }
-
             onDateSelected: {
                 monthViewPage.dateSelected(date);
             }

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-04-19 21:21:52 +0000
+++ TimeLineBaseComponent.qml	2014-04-26 05:02:19 +0000
@@ -19,9 +19,7 @@
     property int scrollHour;
 
     function scrollToCurrentTime() {
-        //scroll to current time
         var currentTime = new Date();
-        //TODO: if current time is early morning should we show time from 9 am ?
         scrollHour = currentTime.getHours();
 
         timeLineView.contentY = scrollHour * units.gu(10);
@@ -76,7 +74,10 @@
             startDay: root.startDay
             model: mainModel
             Component.onCompleted: {
-                model.addModelChangeListener(createAllDayEvents);
+                mainModel.addModelChangeListener(createAllDayEvents);
+            }
+            Component.onDestruction: {
+                mainModel.removeModelChangeListener(createAllDayEvents);
             }
         }
 
@@ -122,6 +123,9 @@
                         Component.onCompleted: {
                             model.addModelChangeListener(createEvents);
                         }
+                        Component.onDestruction: {
+                            model.removeModelChangeListener(createEvents);
+                        }
                     }
                 }
             }

=== modified file 'YearView.qml'
--- YearView.qml	2014-04-19 21:46:54 +0000
+++ YearView.qml	2014-04-26 05:02:19 +0000
@@ -56,7 +56,6 @@
                 yearView.positionViewAtIndex(scrollMonth, GridView.Beginning);
             }
 
-
             Connections{
                 target: pathView
                 onScrollUp: {

=== modified file 'calendar.qml'
--- calendar.qml	2014-04-19 21:22:21 +0000
+++ calendar.qml	2014-04-26 05:02:19 +0000
@@ -290,7 +290,6 @@
                     onLoaded: {
                         item.tools = Qt.binding(function() { return commonToolBar })
                         item.currentMonth = tabs.currentDay.midnight();
-                        print("onLoaded:"+ tabs.currentDay);
                     }
 
                     anchors{