Merge lp:~renatofilho/ubuntu-calendar-app/fix-1311111 into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Make sure that the field is always visible on NewEvent page.
Used a custom toolbar on NewEvent page.

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

FAILED: Continuous integration, rev:254
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/412/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2224
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/412
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/412
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/246

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Renato,

Could you merge trunk into this branch so you get the fix for a bug that prevents the app from running correctly on the device [1]?

[1] https://bugs.launchpad.net/bugs/1312480

[lp:~renatofilho/ubuntu-calendar-app/fix-1311111]

255. By Renato Araujo Oliveira Filho on 2014-04-29

Merged mainline.

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

FAILED: Continuous integration, rev:255
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/421/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2286
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/421
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/421
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/255

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks like the toolbar changed which broke the tests:-

old:- https://imgur.com/3JDJEfI
new:- https://imgur.com/alzy6Rr

review: Needs Fixing

[lp:~renatofilho/ubuntu-calendar-app/fix-1311111]

256. By Renato Araujo Oliveira Filho on 2014-04-29

Fixed autopilot test.

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

FAILED: Continuous integration, rev:256
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/423/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2296/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/423/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/423/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/257/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-1311111]

257. By Renato Araujo Oliveira Filho on 2014-04-29

Fixed python code changes based on pep8 code style

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

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

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Great, thanks Renato.

review: Approve

=== added file 'EditToolbar.qml'
--- EditToolbar.qml	1970-01-01 00:00:00 +0000
+++ EditToolbar.qml	2014-04-29 17:34:52 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Rectangle {
+    id: root
+
+    signal reject()
+    signal accept()
+
+    property alias acceptAction: accept.action
+    property alias rejectAction: reject.action
+
+    color: "gray"
+
+    Button {
+        id: reject
+        objectName: "reject"
+
+        action: Action {
+            text: i18n.tr("Cancel")
+        }
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        onClicked: root.reject()
+    }
+
+    Button {
+        id: accept
+        objectName: "accept"
+
+        action: Action {
+            text: i18n.tr("Done")
+        }
+        anchors {
+            right: parent.right
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        onClicked: root.accept()
+    }
+}

=== added file 'KeyboardRectangle.qml'
--- KeyboardRectangle.qml	1970-01-01 00:00:00 +0000
+++ KeyboardRectangle.qml	2014-04-29 17:34:52 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Item {
+    id: keyboardRect
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+
+    Behavior on height {
+        NumberAnimation {
+            duration: 300
+            easing.type: Easing.InOutQuad
+        }
+    }
+
+    states: [
+        State {
+            name: "hidden"
+            when: keyboardRect.height == 0
+        },
+        State {
+            name: "shown"
+            when: keyboardRect.height == Qt.inputMethod.keyboardRectangle.height
+        }
+    ]
+
+    function recursiveFindFocusedItem(parent) {
+        if (parent.activeFocus) {
+            return parent;
+        }
+
+        for (var i in parent.children) {
+            var child = parent.children[i];
+            if (child.activeFocus) {
+                return child;
+            }
+
+            var item = recursiveFindFocusedItem(child);
+
+            if (item != null) {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    Connections {
+        target: Qt.inputMethod
+
+        onVisibleChanged: {
+            if (!Qt.inputMethod.visible) {
+                var focusedItem = recursiveFindFocusedItem(keyboardRect.parent);
+                if (focusedItem != null) {
+                    focusedItem.focus = false;
+                }
+            }
+        }
+    }
+}

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-04-25 00:17:55 +0000
+++ NewEvent.qml	2014-04-29 17:34:52 +0000
@@ -181,33 +181,10 @@
         pageStack.pop();
     }
 
+    // we use a custom toolbar in this view
     tools: ToolbarItems {
-        //keeping toolbar always open
-        opened: true
         locked: true
-
-        //FIXME: set the icons for toolbar buttons
-        back: ToolbarButton {
-            objectName: "eventCancelButton"
-            action: Action {
-                text: i18n.tr("Cancel");
-                iconSource: Qt.resolvedUrl("cancel.svg");
-                onTriggered: {
-                    pageStack.pop();
-                }
-            }
-        }
-
-        ToolbarButton {
-            objectName: "eventSaveButton"
-            action: Action {
-                text: i18n.tr("Save");
-                iconSource: Qt.resolvedUrl("save.svg");
-                onTriggered: {
-                    saveToQtPim();
-                }
-            }
-        }
+        opened: false
     }
 
     Component{
@@ -228,12 +205,51 @@
         }
     }
 
+    Rectangle {
+        id: availableArea
+
+        width: parent.width
+        color: "red"
+        opacity: 0.5
+        z: 100
+    }
+
+
     Flickable{
         id: flickable
+
+        property var activeItem: null
+
+        function makeMeVisible(item) {
+            if (!item) {
+                return
+            }
+
+            activeItem = item
+            var position = flickable.contentItem.mapFromItem(item, 0, 0);
+
+            // check if the item is already visible
+            var bottomY = flickable.contentY + flickable.height
+            var itemBottom = position.y + item.height
+            if (position.y >= flickable.contentY && itemBottom <= bottomY) {
+                return;
+            }
+
+            // if it is not, try to scroll and make it visible
+            var targetY = position.y + item.height - flickable.height
+            if (targetY >= 0 && position.y) {
+                flickable.contentY = targetY;
+            } else if (position.y < flickable.contentY) {
+                // if it is hidden at the top, also show it
+                flickable.contentY = position.y;
+            }
+            flickable.returnToBounds()
+        }
+
         anchors {
             top: parent.top
             topMargin: units.gu(2)
-            bottom: parent.bottom
+            bottom: toolbar.top
             left: parent.left
             right: parent.right
             leftMargin: units.gu(2)
@@ -432,6 +448,35 @@
         }
     }
 
+    EditToolbar {
+        id: toolbar
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: units.gu(6)
+        acceptAction: Action {
+            text: i18n.tr("Save")
+            onTriggered: saveToQtPim();
+        }
+        rejectAction: Action {
+            text: i18n.tr("Cancel")
+            onTriggered: pageStack.pop();
+        }
+    }
+
+    // used to keep the field visible when the keyboard appear or dismiss
+    KeyboardRectangle {
+        id: keyboard
+
+        onHeightChanged: {
+            if (flickable.activeItem) {
+                flickable.makeMeVisible(flickable.activeItem)
+            }
+        }
+    }
+
     QtObject {
         id: internal
 

=== modified file 'NewEventEntryField.qml'
--- NewEventEntryField.qml	2014-04-25 00:17:55 +0000
+++ NewEventEntryField.qml	2014-04-29 17:34:52 +0000
@@ -16,4 +16,10 @@
     font {
         pixelSize: focus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
     }
+
+    onActiveFocusChanged: {
+        if (activeFocus) {
+            flickable.makeMeVisible(root)
+        }
+    }
 }

=== modified file 'tests/autopilot/calendar_app/emulators.py'
--- tests/autopilot/calendar_app/emulators.py	2014-03-20 02:42:05 +0000
+++ tests/autopilot/calendar_app/emulators.py	2014-04-29 17:34:52 +0000
@@ -106,3 +106,13 @@
 
     def get_num_events(self):
         return len(self.select_many("EventBubble"))
+
+    def get_new_event_save_button(self):
+        new_event = self.get_new_event()
+        return new_event.wait_select_single("Button",
+                                            objectName="accept")
+
+    def get_new_event_cancel_button(self):
+        new_event = self.get_new_event()
+        return new_event.wait_select_single("Button",
+                                            objectName="cancel")

=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/calendar_app/tests/test_calendar.py	2014-04-12 04:06:45 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2014-04-29 17:34:52 +0000
@@ -88,7 +88,8 @@
         self.assertThat(location_field.text, Eventually(Equals("My location")))
 
         #click save button
-        self.main_view.open_toolbar().click_button("eventSaveButton")
+        save_button = self.main_view.get_new_event_save_button()
+        self.pointing_device.click_object(save_button)
 
         #verify that the event has been created in timeline
         self.main_view.open_toolbar().click_button("todaybutton")