dialer-app

Merge lp:~renatofilho/dialer-app/contacts-search into lp:dialer-app

contacts-search
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2014-06-30

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2014-07-08
Approved revision:	163
Merged at revision:	169
Proposed branch:	lp:~renatofilho/dialer-app/contacts-search
Merge into:	lp:dialer-app
Diff against target:	141 lines (+112/-1) 2 files modified src/qml/ContactsPage/ContactsPage.qml (+32/-1) src/qml/ContactsPage/KeyboardRectagle.qml (+80/-0)
To merge this branch:	bzr merge lp:~renatofilho/dialer-app/contacts-search
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2014-06-30	Approve on 2014-07-08
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-08
Review via email: mp+225081@code.launchpad.net

Commit message

Implemented contact search on ContactsPage.qml

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/266/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/dialer-app/contacts-search updated on 2014-07-04

159. By Renato Araujo Oliveira Filho on 2014-07-04: Does not move the contact list while searching this will be handled by contact list code.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/267/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/dialer-app/contacts-search updated on 2014-07-07

160. By Renato Araujo Oliveira Filho on 2014-07-07: Trunk merged.

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-07-07:

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO UI CHANGE

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/272/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/dialer-app/contacts-search updated on 2014-07-07

161. By Renato Araujo Oliveira Filho on 2014-07-07: Call message app if use click on message icon on contact list.
162. By Renato Araujo Oliveira Filho on 2014-07-07: Used KeyboardRectagle to anchor the contact list when the keyboard appears.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/273/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/dialer-app/contacts-search updated on 2014-07-08

163. By Renato Araujo Oliveira Filho on 2014-07-08: Added missing file.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/274/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/275/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-07-08:

58 === added file 'src/qml/ContactsPage/KeyboardRectagle.qml'
59 --- src/qml/ContactsPage/KeyboardRectagle.qml 1970-01-01 00:00:00 +0000
60 +++ src/qml/ContactsPage/KeyboardRectagle.qml 2014-07-08 00:34:51 +0000

This KeyboardRectangle hack is not necessary anymore. You can use MainView's anchorToKeyboard property instead.

review: Needs Fixing

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-07-08:

The anchorToKeyboard did not work in this case. I do not know why.

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-07-08:

> The anchorToKeyboard did not work in this case. I do not know why.

Ok. We can revisit the case later.

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-07-08:

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but it was a jenkins failure, not a dialer-app failure.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Ishan Joshi

Renato Araujo Oliveira Filho

Ubuntu Phablet Team

 === modified file 'src/qml/ContactsPage/ContactsPage.qml'
 --- src/qml/ContactsPage/ContactsPage.qml	2014-06-11 21:10:27 +0000
 +++ src/qml/ContactsPage/ContactsPage.qml	2014-07-08 00:34:51 +0000
@@ -29,14 +29,42 @@
      title: i18n.tr("Contacts")
      property QtObject contact
++    __customHeaderContents: TextField {
++        id: searchField
++
++        anchors {
++            left: parent.left
++            leftMargin: units.gu(2)
++            right: parent.right
++            rightMargin: units.gu(2)
++            topMargin: units.gu(1.5)
++            bottomMargin: units.gu(1.5)
++            verticalCenter: parent.verticalCenter
++        }
++        onTextChanged: contactList.currentIndex = -1
++        inputMethodHints: Qt.ImhNoPredictiveText
++        placeholderText: i18n.tr("Type a name or phone to search")
++    }
++
      ContactListView {
          id: contactList
--        anchors.fill: parent
++
++        anchors{
++            top: parent.top
++            left: parent.left
++            right: parent.right
++            bottom: keyboardRect.top
++        }
          onInfoRequested: {
             mainView.viewContact(contact.contactId)
+         }
++        filterTerm: searchField.text
          detailToPick: ContactDetail.PhoneNumber
          onDetailClicked: {
++            if (action === "message") {
++                Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
++                return
++            }
              pageStack.pop()
              if (callManager.hasCalls) {
                  mainView.call(detail.number);
@@ -46,5 +74,8 @@
+         }
+     }
++    KeyboardRectagle {
++        id: keyboardRect
++    }
+ }
 === added file 'src/qml/ContactsPage/KeyboardRectagle.qml'
 --- src/qml/ContactsPage/KeyboardRectagle.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/ContactsPage/KeyboardRectagle.qml	2014-07-08 00:34:51 +0000
@@ -0,0 +1,80 @@
++/*
++ * Copyright 2012-2014 Canonical Ltd.
++ *
++ * This file is part of dialer-app.
++ *
++ * dialer-app 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.
++ *
++ * dialer-app 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;
++                }
++            }
++        }
++    }
++}

dialer-app

Merge lp:~renatofilho/dialer-app/contacts-search into lp:dialer-app

Commit message

Description of the change

Preview Diff

Subscribers