Merge lp:~ubuntu-calendar-dev/ubuntu-calendar-app/3-Improve-DayView into lp:ubuntu-calendar-app

[Nekhelesh Ramananthan]

Improved DayView

Improved DayView

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

FAILED: Continuous integration, rev:469
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/827/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/393/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/385/console

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

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-calendar-dev/ubuntu-calendar-app/3-Improve-DayView]

470. By Nekhelesh Ramananthan on 2014-09-19

Merged prerequisite branch updates

471. By Nekhelesh Ramananthan on 2014-09-19

More AP fixes

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

FAILED: Continuous integration, rev:471
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/828/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/394
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/394/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/386

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

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-calendar-dev/ubuntu-calendar-app/3-Improve-DayView]

472. By Nekhelesh Ramananthan on 2014-09-19

Forgot to remove old line

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

PASSED: Continuous integration, rev:472
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/830/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/396
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/396/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/388

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

LGTM.
Thanks Nekhelesh

review: Approve

=== modified file 'DayView.qml'
--- DayView.qml	2014-09-19 10:36:39 +0000
+++ DayView.qml	2014-09-19 13:33:01 +0000
@@ -41,121 +41,91 @@
         }
     }
 
-    head.actions: [
-        calendarTodayAction,
-        commonHeaderActions.newEventAction,
-        commonHeaderActions.showCalendarAction,
-        commonHeaderActions.reloadAction
-    ]
-
-    Column {
-        id: column
-        anchors.top: parent.top
-        anchors.topMargin: units.gu(1.5)
-        width: parent.width; height: parent.height
-        spacing: units.gu(1)
+    head {
+        actions: [
+            calendarTodayAction,
+            commonHeaderActions.newEventAction,
+            commonHeaderActions.showCalendarAction,
+            commonHeaderActions.reloadAction
+        ]
+
+        contents: Column{
+            width: parent ? parent.width - units.gu(2) : undefined
+
+            Label {
+                fontSize: "medium"
+                text: i18n.tr(currentDay.toLocaleString(Qt.locale(),i18n.tr("dddd")))
+            }
+
+            Label {
+                id:cuurentDay
+                objectName:"monthYearLabel"
+                fontSize: "large"
+                text:i18n.tr(currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM dd, yyyy")))
+            }
+        }
+    }
+
+    PathViewBase{
+        id: dayViewPath
+        objectName: "dayViewPath"
+
+        property var startDay: currentDay
+        //This is used to scroll all view together when currentItem scrolls
+        property var childContentY;
 
         anchors.fill: parent
 
-        ViewHeader{
-            id: viewHeader
-            month: currentDay.getMonth()
-            year: currentDay.getFullYear()
-        }
-
-        TimeLineHeader{
-            id: dayHeader
+        onNextItemHighlighted: {
+            //next day
+            currentDay = currentDay.addDays(1);
+        }
+
+        onPreviousItemHighlighted: {
+            //previous day
+            currentDay = currentDay.addDays(-1);
+        }
+
+        delegate: TimeLineBaseComponent {
+            id: timeLineView
+            objectName: "DayComponent-"+index
+
             type: ViewType.ViewTypeDay
-            date: currentDay
-            preferredHighlightBegin: 0.5
-            preferredHighlightEnd: 0.5
-            path: Path {
-                startX: -(dayHeader.width/7); startY: dayHeader.height/2
-                PathLine { x: (dayHeader.width/7) * 8  ; relativeY: 0;  }
-            }
-            onDateSelected: {
-                if(date < currentDay){
-                    currentDay = currentDay.addDays(-1);
-                    dayHeader.decrementCurrentIndex()
-                }
-                else if( date > currentDay){
-                    currentDay = currentDay.addDays(1);
-                    dayHeader.incrementCurrentIndex();
-                }
-            }
-        }
-
-        PathViewBase{
-            id: dayViewPath
-            objectName: "dayViewPath"
-
-            property var startDay: currentDay
-            //This is used to scroll all view together when currentItem scrolls
-            property var childContentY;
-
-            preferredHighlightBegin: 0.5
-            preferredHighlightEnd: 0.5
 
             width: parent.width
-            height: column.height - dayViewPath.y
-
-            path: Path {
-                startX: -(dayViewPath.width/1.75); startY: dayViewPath.height/2
-                PathLine { x: (dayViewPath.width/7) * 11  ; relativeY: 0;  }
-            }
-
-            onNextItemHighlighted: {
-                //next day
-                currentDay = currentDay.addDays(1);
-                dayHeader.incrementCurrentIndex()
-            }
-
-            onPreviousItemHighlighted: {
-                //previous day
-                currentDay = currentDay.addDays(-1);
-                dayHeader.decrementCurrentIndex()
-            }
-
-            delegate: TimeLineBaseComponent {
-                id: timeLineView
-                objectName: "DayComponent-"+index
-
-                type: ViewType.ViewTypeDay
-
-                width: parent.width/7 * 5
-                height: parent.height
-                z: index == dayViewPath.currentIndex ? 2 : 1
-                isActive: true
-
-                Connections{
-                    target: dayViewPage
-                    onIsCurrentPageChanged:{
-                        if(dayViewPage.isCurrentPage){
-                            timeLineView.scrollToCurrentTime();
-                        }
+            height: parent.height
+            z: index == dayViewPath.currentIndex ? 2 : 1
+            isActive: true
+
+            Connections{
+                target: dayViewPage
+                onIsCurrentPageChanged:{
+                    if(dayViewPage.isCurrentPage){
+                        timeLineView.scrollToCurrentTime();
                     }
                 }
-
-                //get contentY value from PathView, if its not current Item
-                Binding{
-                    target: timeLineView
-                    property: "contentY"
-                    value: dayViewPath.childContentY;
-                    when: !timeLineView.PathView.isCurrentItem
-                }
-
-                //set PathView's contentY property, if its current item
-                Binding{
-                    target: dayViewPath
-                    property: "childContentY"
-                    value: contentY
-                    when: timeLineView.PathView.isCurrentItem
-                }
-
-                contentInteractive: timeLineView.PathView.isCurrentItem
-
-                startDay: dayViewPath.startDay.addDays(dayViewPath.indexType(index))
-            }
+            }
+
+            //get contentY value from PathView, if its not current Item
+            Binding{
+                target: timeLineView
+                property: "contentY"
+                value: dayViewPath.childContentY;
+                when: !timeLineView.PathView.isCurrentItem
+            }
+
+            //set PathView's contentY property, if its current item
+            Binding{
+                target: dayViewPath
+                property: "childContentY"
+                value: contentY
+                when: timeLineView.PathView.isCurrentItem
+            }
+
+            contentInteractive: timeLineView.PathView.isCurrentItem
+
+            startDay: dayViewPath.startDay.addDays(dayViewPath.indexType(index))
         }
     }
 }
+

=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml	2014-09-19 13:33:01 +0000
+++ TimeLineBackground.qml	2014-09-19 13:33:01 +0000
@@ -38,9 +38,15 @@
                     return new Date(0, 0, 0, index).toLocaleTimeString
                             (locale, locale.timeFormat(Locale.NarrowFormat))
                 }
+
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+
                 color: UbuntuColors.lightGrey
-                anchors.centerIn: parent
-                fontSize: "x-large"
+                fontSize: "small"
             }
         }
     }

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-09-19 13:33:01 +0000
+++ TimeLineBaseComponent.qml	2014-09-19 13:33:01 +0000
@@ -120,7 +120,15 @@
 
             Row {
                 id: week
-                anchors.fill: parent
+
+                anchors {
+                    fill: parent
+                    leftMargin: type == ViewType.ViewTypeWeek ? units.gu(0)
+                                                              : units.gu(10)
+
+                    rightMargin: type == ViewType.ViewTypeWeek ? units.gu(0)
+                                                              : units.gu(4)
+                }
 
                 Repeater {
                     model: type == ViewType.ViewTypeWeek ? 7 : 1

=== modified file 'tests/autopilot/calendar_app/tests/test_dayview.py'
--- tests/autopilot/calendar_app/tests/test_dayview.py	2014-09-04 16:04:37 +0000
+++ tests/autopilot/calendar_app/tests/test_dayview.py	2014-09-19 13:33:01 +0000
@@ -43,56 +43,10 @@
 
         now = datetime.datetime.now()
 
-        expected_year = now.year
-        expected_month_name = now.strftime("%B")
-
-        self.assertThat(self.app.main_view.get_year(self.day_view),
-                        Equals(expected_year))
-
-        self.assertThat(self.app.main_view.get_month_name(self.day_view),
-                        Equals(expected_month_name))
-
-    def test_show_current_days(self):
-        """By default, the day view show the last day, the current
-
-        and the next day.
-
-        """
-
-        days = self.day_view.select_many(objectName='dateLabel')
-        days = [int(day.text) for day in days]
-
-        now = datetime.datetime.now()
-
-        today = now.day
-        tomorrow = (now + datetime.timedelta(days=1)).day
-        yesterday = (now - datetime.timedelta(days=1)).day
-
-        self.assertIn(today, days)
-        self.assertIn(tomorrow, days)
-        self.assertIn(yesterday, days)
-
-    def test_switch_day_by_tapping(self):
-        """Selecting a day by touching the screen should also switch the day"""
-        today = self.day_view.get_day_header().startDay.datetime
-
-        # click yesterday
-        yesterday = (today - datetime.timedelta(days=1))
-        yesterday_header = self.day_view.get_day_header(yesterday)
-
-        self.assertThat(yesterday_header.isCurrentItem, Equals(False))
-        self.app.pointing_device.click_object(yesterday_header)
-        self.assertThat(yesterday_header.isCurrentItem,
-                        Eventually(Equals(True)))
-
-        # click tomorrow
-        tomorrow = (yesterday + datetime.timedelta(days=1))
-        tomorrow_header = self.day_view.get_day_header(tomorrow)
-
-        self.assertThat(tomorrow_header.isCurrentItem, Equals(False))
-        self.app.pointing_device.click_object(tomorrow_header)
-        self.assertThat(tomorrow_header.isCurrentItem,
-                        Eventually(Equals(True)))
+        expected_month_name_year = now.strftime("%B %d, %Y")
+
+        self.assertThat(self.app.main_view.get_month_year(self.day_view),
+                        Equals(expected_month_name_year))
 
     def test_show_next_days(self):
         """It must be possible to show next days by swiping the view."""

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2014-09-19 13:33:01 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2014-09-19 13:33:01 +0000
@@ -177,7 +177,9 @@
         self.assertThat(day_view.visible, Eventually(Equals(True)))
 
         # Check that the 'Day' view is on the correct/selected day.
-        selected_date = day_view.select_single("TimeLineHeader").date
+        selected_date = datetime.datetime.strptime(
+            self.app.main_view.get_month_year(day_view),
+            '%B %d, %Y')
         self.assertThat(expected_day, Equals(selected_date.day))
         self.assertThat(expected_month, Equals(selected_date.month))
         self.assertThat(expected_year, Equals(selected_date.year))