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

[Kunal Parmar]

Redesign implemented for Year and Month View as per below link,

https://docs.google.com/presentation/d/14NIPecPFKb_8Ad3O4suEGJqVOw9bC4n0s63uWalbZ98/edit#slide=id.g2c4a617df_1_0

also resolves bug #1399220

Redesign implemented for Year and Month View as per below link,

https://docs.google.com/presentation/d/14NIPecPFKb_8Ad3O4suEGJqVOw9bC4n0s63uWalbZ98/edit#slide=id.g2c4a617df_1_0

also resolves bug #1399220

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

FAILED: Continuous integration, rev:561
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1045/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/417
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/417/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/42

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:562
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1046/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/437
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/437/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/43

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me !!!

Thanks Kunal.

review: Approve

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2014-11-08 02:00:10 +0000
+++ MonthComponent.qml	2014-12-11 13:07:01 +0000
@@ -124,22 +124,28 @@
 
         spacing: units.gu(1.5)
 
-        ViewHeader{
-            id: monthHeader
-            month: intern.curMonth
-            year: intern.curMonthYear
+        Loader {
+            width: parent.width
+            height: isYearView ? FontUtils.sizeToPixels(root.monthLabelFontSize) : 0;
+            sourceComponent: isYearView ? headerComp : undefined
+            Component{
+                id: headerComp
+                ViewHeader{
+                    id: monthHeader
+                    anchors.fill: parent
+                    month: intern.curMonth
+                    year: intern.curMonthYear
 
-            monthLabelFontSize: root.monthLabelFontSize
-            yearLabelFontSize: root.yearLabelFontSize
-            visible: isYearView === true
+                    monthLabelFontSize: root.monthLabelFontSize
+                    yearLabelFontSize: root.yearLabelFontSize
+                }
+            }
         }
 
         Item {
             width: parent.width
             height: dayLabelRow.height + units.gu(1)
 
-            DayHeaderBackground{}
-
             Row{
                 id: dayLabelRow
 
@@ -229,14 +235,8 @@
             text: isYearView ? day.charAt(0) : day;
             horizontalAlignment: Text.AlignHCenter
             font.pixelSize: intern.dayFontSize
-            color: "white"
-        }
-    }
-
-    Component{
-        id: highLightComp
-        UbuntuShape{
-            color: "#DD4814"
+            font.bold: true
+            color: "black"
         }
     }
 }

=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml	2014-11-08 02:00:10 +0000
+++ MonthComponentDateDelegate.qml	2014-12-11 13:07:01 +0000
@@ -13,43 +13,37 @@
     Loader {
         sourceComponent: isToday && isCurrentMonth ? highLightComp : undefined
         onSourceComponentChanged: {
-            width =  Qt.binding( function() { return parent.width < parent.height ? parent.width : parent.height } );
+            width = Qt.binding( function() { return ( dateRootItem.height / 1.5 ); });
             height = Qt.binding ( function() { return width} );
-            anchors.centerIn = Qt.binding( function() { return parent});
+            anchors.centerIn = Qt.binding( function() { return dateLabel});
         }
     }
 
-    Column {
-        id: columns
+    Label {
+        id: dateLabel
         anchors.centerIn: parent
-        width: parent.width
-        spacing: units.gu(0.5)
-        Label {
-            id: dateLabel
-            text: date
-            anchors.horizontalCenter: parent.horizontalCenter
-            fontSize: root.dateLabelFontSize
-            color: {
-                if( isCurrentMonth ) {
-                    if(isToday) {
-                        "white"
-                    } else {
-                        "#5D5D5D"
-                    }
+        text: date
+        fontSize: root.dateLabelFontSize
+        color: {
+            if( isCurrentMonth ) {
+                if(isToday) {
+                    "white"
                 } else {
-                    "#AEA79F"
+                    "#5D5D5D"
                 }
+            } else {
+                "#AEA79F"
             }
         }
+    }
 
-        Loader{
-            sourceComponent: showEvent ? eventIndicatorComp : undefined
-            onSourceComponentChanged: {
-                width = Qt.binding( function() { return units.gu(1) } );
-                height = Qt.binding( function() { return width } );
-                anchors.horizontalCenter =  Qt.binding( function () { return parent.horizontalCenter } );
-            }
-        }
+    Loader{
+        width: units.gu(1)
+        height: width
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: dateLabel.bottom
+        anchors.topMargin: dateRootItem.height/4
+        sourceComponent: showEvent ? eventIndicatorComp : undefined
     }
 
     Component{
@@ -61,6 +55,13 @@
         }
     }
 
+    Component{
+        id: highLightComp
+        UbuntuShape{
+            color: "#DD4814"
+        }
+    }
+
     MouseArea {
         anchors.fill: parent
         onPressAndHold: {

=== modified file 'ViewHeader.qml'
--- ViewHeader.qml	2014-09-20 10:45:35 +0000
+++ ViewHeader.qml	2014-12-11 13:07:01 +0000
@@ -36,7 +36,7 @@
         text: Qt.locale().standaloneMonthName(month)
         anchors.leftMargin: units.gu(1)
         anchors.left: parent.left
-        //color:"white"
+        color:"black"
         anchors.verticalCenter: parent.verticalCenter
     }
 
@@ -47,7 +47,7 @@
         text: year
         anchors.right: parent.right
         anchors.rightMargin: units.gu(1)
-        color:"#AEA79F"
+        color:"black"
         anchors.verticalCenter: parent.verticalCenter
     }
 }

=== modified file 'YearViewDelegate.qml'
--- YearViewDelegate.qml	2014-10-22 18:39:27 +0000
+++ YearViewDelegate.qml	2014-12-11 13:07:01 +0000
@@ -65,10 +65,9 @@
         Component {
             id: delegateComponent
 
-            UbuntuShape {
+            Item {
                 anchors.fill: parent
                 anchors.margins: units.gu(0.5)
-                radius: "medium"
 
                 MonthComponent {
                     id: monthComponent
@@ -84,7 +83,7 @@
                     dayLabelFontSize:"x-small"
                     dateLabelFontSize: "medium"
                     monthLabelFontSize: "medium"
-                    yearLabelFontSize: "small"
+                    yearLabelFontSize: "medium"
 
                     onMonthSelected: {
                         yearViewPage.monthSelected(date);

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2014-11-30 19:13:27 +0000
+++ tests/autopilot/calendar_app/__init__.py	2014-12-11 13:07:01 +0000
@@ -347,7 +347,7 @@
 
     def get_current_month_name(self):
         month = self.get_current_month()
-        return month.select_single('Label', objectName='monthLabel').text
+        return month.currentMonth.datetime.strftime("%B")
 
 
 class DayView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):