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

[Kunal Parmar]

YearView changed to use GridView
MonthComponent is creating hilight only when necessary

YearView changed to use GridView
MonthComponent is creating hilight only when necessary

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

140. By Kunal Parmar on 2013-10-09

newlines removed

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

PASSED: Continuous integration, rev:140
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/127/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/832
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/127

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

review: Approve (continuous-integration)

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

141. By Kunal Parmar on 2013-10-09

reused view header

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

PASSED: Continuous integration, rev:141
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/128/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/833
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/128
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/128
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/128
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/128

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

When I click on any month in the year view, I’m getting the following error:

    YearView.qml:79: ReferenceError: monthDate is not defined

review: Needs Fixing

[Olivier Tilloy (osomon)]

52 + property bool shouldCreateHighlight: date.isSameDay(DateExt.today()) && isCurrentMonth
53 + property var hightlightObj;
54 +
55 + onShouldCreateHighlightChanged: {
56 + if( shouldCreateHighlight ) {
57 + hightlightObj = highLightComp.createObject(dateRootItem);
58 + hightlightObj.z = hightlightObj.z -1;
59 + } else {
60 + if( hightlightObj) {
61 + hightlightObj.destroy();
62 + }
63 + }

Please use a Loader element instead of manually instantiating/destroying objects.

review: Needs Fixing

[Olivier Tilloy (osomon)]

128 + flow: Grid.LeftToRight

Grid.LeftToRight is the default value, so this is useless.

review: Needs Fixing

[Olivier Tilloy (osomon)]

169 + model: 6/*rows*/ * 2 /*columns*/

or, simpler:

    model: 12 /* months in a year */

[Olivier Tilloy (osomon)]

178 + width: parent.width - units.gu(1)
179 + height: parent.height - units.gu(1)
180 + anchors.centerIn: parent

Better to use "anchors.fill: parent" and "anchors.margins: units.gu(0.5)" in that case.

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

142. By Kunal Parmar on 2013-10-09

monthDate is not defined fixed

143. By Kunal Parmar on 2013-10-09

flow: Grid.LeftToRight

144. By Kunal Parmar on 2013-10-09

 model: 12 /* months in a year */

145. By Kunal Parmar on 2013-10-09

layouting fixed for monthComponent

146. By Kunal Parmar on 2013-10-09

Loader used instead of manual creation of object

[Kunal Parmar (pkunal-parmar)]

Thanks, I addressed your comments, Pls have a look again.

[Olivier Tilloy (osomon)]

> Thanks, I addressed your comments, Pls have a look again.

Looks like you forgot to push your changes to the branch, I’m not seeing any updates.

[Kunal Parmar (pkunal-parmar)]

> > Thanks, I addressed your comments, Pls have a look again.
>
> Looks like you forgot to push your changes to the branch, I’m not seeing any
> updates.

Someting is wrong with bzr, when I use bzr push, it it pushing changes to different branch.
But now this branch should have my recent changes. Thanks..

[Kunal Parmar (pkunal-parmar)]

BTW, can you check out this MR as well

https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/day_background/+merge/188195

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

PASSED: Continuous integration, rev:146
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/134/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/843
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/134
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/134
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/134
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/134

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

> Someting is wrong with bzr, when I use bzr push, it it pushing changes to
> different branch.

If you issue `bzr info`, it will show where it will push by default. You can change the default push location with `bzr push --remember $LOCATION`

[Olivier Tilloy (osomon)]

46 + property bool shouldCreateHighlight: date.isSameDay(DateExt.today()) && isCurrentMonth
47 +
48 + onShouldCreateHighlightChanged: {
49 + if( shouldCreateHighlight ) {
50 + highlightLoader.sourceComponent = highLightComp;
51 + } else {
52 + //unloading the highlight
53 + highlightLoader.sourceComponent = undefined
54 + }
55 + }

This is better, but it can be taken one step further to make it fully declarative: remove entirely the shouldCreateHighlight property, and do this:

    Loader {
        sourceComponent: date.isSameDay(DateExt.today()) && isCurrentMonth ? highLightComp : undefined
        […]
    }

(and you can then remove the 'highlightLoader' id which will be unused).

review: Needs Fixing

[Olivier Tilloy (osomon)]

78 + id: highLightRect

Please also remove this id which is unused.

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

147. By Kunal Parmar on 2013-10-09

id: highLightRect removed

148. By Kunal Parmar on 2013-10-09

using declarative way to load a loader

[Kunal Parmar (pkunal-parmar)]

> > Someting is wrong with bzr, when I use bzr push, it it pushing changes to
> > different branch.
>
> If you issue `bzr info`, it will show where it will push by default. You can
> change the default push location with `bzr push --remember $LOCATION`

Thanks, this helped

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

149. By Kunal Parmar on 2013-10-09

merge from trunk

[Kunal Parmar (pkunal-parmar)]

> 46 + property bool shouldCreateHighlight:
> date.isSameDay(DateExt.today()) && isCurrentMonth
> 47 +
> 48 + onShouldCreateHighlightChanged: {
> 49 + if( shouldCreateHighlight ) {
> 50 + highlightLoader.sourceComponent = highLightComp;
> 51 + } else {
> 52 + //unloading the highlight
> 53 + highlightLoader.sourceComponent = undefined
> 54 + }
> 55 + }
>
> This is better, but it can be taken one step further to make it fully
> declarative: remove entirely the shouldCreateHighlight property, and do this:
>

Done, please have another look
> Loader {
> sourceComponent: date.isSameDay(DateExt.today()) && isCurrentMonth ?
> highLightComp : undefined
> […]
> }
>
> (and you can then remove the 'highlightLoader' id which will be unused).

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

PASSED: Continuous integration, rev:149
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/136/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/863
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/136

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good now, thanks!

review: Approve

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2013-09-04 13:37:10 +0000
+++ MonthComponent.qml	2013-10-09 23:35:38 +0000
@@ -35,30 +35,11 @@
             anchors.fill: parent
             spacing: units.gu(1.5)
 
-            Item{
+            ViewHeader{
                 id: monthHeader
-                width: parent.width
-                height: monthLabel.height
-
-                Label{
-                    id: monthLabel
-                    fontSize: monthLabelFontSize
-                    text: Qt.locale().standaloneMonthName(root.monthDate.getMonth())
-                    anchors.leftMargin: units.gu(1)
-                    anchors.left: parent.left
-                    //color:"white"
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                Label{
-                    id: yearLabel
-                    fontSize: yearLabelFontSize
-                    text: root.monthDate.getFullYear()
-                    anchors.right: parent.right
-                    anchors.rightMargin: units.gu(1)
-                    color:"#AEA79F"
-                    anchors.verticalCenter: parent.verticalCenter
-                }
+                date: root.monthDate
+                monthLabelFontSize: root.monthLabelFontSize
+                yearLabelFontSize: root.yearLabelFontSize
             }
 
             Row{
@@ -106,15 +87,11 @@
             width: parent.width / 7;
             height: parent.height / parent.weekCount
 
-            UbuntuShape{
-                id: highLightRect
-
+            Loader {
                 width: parent.width
                 height: width
                 anchors.centerIn: parent
-
-                color: "white"
-                visible: date.isSameDay(DateExt.today()) && isCurrentMonth
+                sourceComponent: date.isSameDay(DateExt.today()) && isCurrentMonth ? highLightComp : undefined
             }
 
             Label{
@@ -156,4 +133,11 @@
             color: "#AEA79F"
         }
     }
+
+    Component{
+        id: highLightComp
+        UbuntuShape{
+            color: "white"
+        }
+    }
 }
 
=== modified file 'ViewHeader.qml'
--- ViewHeader.qml	2013-09-16 14:04:37 +0000
+++ ViewHeader.qml	2013-10-09 23:35:38 +0000
@@ -7,10 +7,12 @@
     height: monthLabel.height
 
     property var date;
+    property string monthLabelFontSize: "x-large"
+    property string yearLabelFontSize: "large"
 
     Label{
         id: monthLabel
-        fontSize: "large"
+        fontSize: monthLabelFontSize
         text: Qt.locale().standaloneMonthName(date.getMonth())
         anchors.leftMargin: units.gu(1)
         anchors.left: parent.left
@@ -20,7 +22,7 @@
 
     Label{
         id: yearLabel
-        fontSize: "medium"
+        fontSize: yearLabelFontSize
         text: date.getFullYear()
         anchors.right: parent.right
         anchors.rightMargin: units.gu(1)
 
=== modified file 'YearView.qml'
--- YearView.qml	2013-09-16 14:04:01 +0000
+++ YearView.qml	2013-10-09 23:35:38 +0000
@@ -29,7 +29,7 @@
         property var startYear: getDateFromYear(currentYear.getFullYear()-1);
     }
 
-    delegate: Flickable{
+    delegate: GridView{
         id: yearView
         clip: true
 
@@ -48,38 +48,32 @@
 
         width: parent.width
         height: parent.height
-
-        contentHeight: yearGrid.height + units.gu(2)
-        contentWidth: width
-
-        Grid{
-            id: yearGrid
-            rows: 6
-            columns: 2
-
-            anchors.top: parent.top
-            anchors.topMargin: units.gu(1.5)
-
-            width: parent.width - ((columns-1) * yearGrid.spacing)
-            spacing: units.gu(2)
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            Repeater{
-                model: yearGrid.rows * yearGrid.columns
-                delegate: MonthComponent{
-                    monthDate: new Date(yearView.year.getFullYear(),index,1,0,0,0,0)
-                    width: (parent.width - units.gu(2))/2
-                    height: width * 1.5
-                    dayLabelFontSize:"x-small"
-                    dateLabelFontSize: "medium"
-                    monthLabelFontSize: "medium"
-                    yearLabelFontSize: "small"
-
-                    MouseArea{
-                        anchors.fill: parent
-                        onClicked: {
-                            root.monthSelected(monthDate);
-                        }
+        anchors.top: parent.top
+
+        cellWidth: width/2
+        cellHeight: cellWidth * 1.2
+
+        model: 12 /* months in a year */
+        snapMode: GridView.SnapOneRow
+        delegate: Item {
+            width: yearView.cellWidth
+            height: yearView.cellHeight
+
+            MonthComponent{
+                id: monthComponent
+                monthDate: new Date(yearView.year.getFullYear(),index,1,0,0,0,0)
+                anchors.fill: parent
+                anchors.margins: units.gu(0.5)
+
+                dayLabelFontSize:"x-small"
+                dateLabelFontSize: "medium"
+                monthLabelFontSize: "medium"
+                yearLabelFontSize: "small"
+
+                MouseArea{
+                    anchors.fill: parent
+                    onClicked: {
+                        root.monthSelected(monthComponent.monthDate);
                     }
                 }
             }