Merge lp:~tiagosh/address-book-app/fix-1199122 into lp:address-book-app

[Tiago Salem Herrmann]

Do not bind mainview to keyboard, so we dont show the toolbar when dismissing the osk.

do not bind mainview to keyboard so we dont show the toolbar when dismissing the osk.

This MR adds a custom component called KeyboardRectangle, same component we use in messaging-app and the old phone-app.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/135
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/824
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3290
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3290/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/826
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/826/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/698

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/134/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

doesn't work for me. If I press edit or add I just get a blank view now

review: Needs Fixing

[lp:~tiagosh/address-book-app/fix-1199122]

64. By Tiago Salem Herrmann on 2013-09-11

fix cmakelists.txt

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/137
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2796
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/849
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/849/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/718

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/136/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

this works, however I did notice a related bug. If you dismiss the keyboard and then click in an entry field near the bottom of the page, when the keyboard is shown the field is not scrolled into view and it should be. Is it possible to update this MR to fix that issue or should we approve this and do that fix in a separate MR?

[Bill Filler (bfiller)]

approving this for now, will file a separate bug for scroll into view issue

review: Approve

=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
--- src/imports/ContactEdit/CMakeLists.txt	2013-08-02 17:40:44 +0000
+++ src/imports/ContactEdit/CMakeLists.txt	2013-09-11 17:49:15 +0000
@@ -9,6 +9,8 @@
     ContactDetailWithTypeEditor.qml
     ContactEditor.qml
     EditToolbar.qml
+    KeyboardRectangle.qml
+    StandardAnimation.qml
     TextInputDetail.qml
     ValueSelector.qml
 )

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2013-08-28 17:06:38 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2013-09-11 17:49:15 +0000
@@ -213,7 +213,7 @@
         anchors {
             left: parent.left
             right: parent.right
-            bottom: parent.bottom
+            bottom: keyboard.top
         }
         height: units.gu(6)
         acceptAction: Action {
@@ -229,4 +229,8 @@
             onTriggered: pageStack.pop()
         }
     }
+    
+    KeyboardRectangle {
+        id: keyboard
+    }
 }

=== added file 'src/imports/ContactEdit/KeyboardRectangle.qml'
--- src/imports/ContactEdit/KeyboardRectangle.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactEdit/KeyboardRectangle.qml	2013-09-11 17:49:15 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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 {
+        StandardAnimation { }
+    }
+
+    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;
+                }
+            }
+        }
+    }
+}

=== added file 'src/imports/ContactEdit/StandardAnimation.qml'
--- src/imports/ContactEdit/StandardAnimation.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactEdit/StandardAnimation.qml	2013-09-11 17:49:15 +0000
@@ -0,0 +1,22 @@
+/*
+ * 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
+
+NumberAnimation {
+    duration: 300
+    easing.type: Easing.InOutQuad
+}

=== modified file 'src/imports/main.qml'
--- src/imports/main.qml	2013-09-09 21:38:01 +0000
+++ src/imports/main.qml	2013-09-11 17:49:15 +0000
@@ -23,7 +23,7 @@
 
     width: units.gu(40)
     height: units.gu(71)
-    anchorToKeyboard: true
+    anchorToKeyboard: false
 
     signal applicationReady()