Merge into trunk : fix-1231442 : Code : messaging-app

Status:

Merged

Approved by:

Gustavo Pichorim Boiko on 2013-09-27

Approved revision:

41

Merged at revision:

40

Proposed branch:

lp:~tiagosh/messaging-app/fix-1231442

Merge into:

lp:messaging-app

Diff against target:

145 lines (+65/-31)

2 files modified

src/qml/Messages.qml (+60/-5)
src/qml/ThreadDelegate.qml (+5/-26)

To merge this branch:

bzr merge lp:~tiagosh/messaging-app/fix-1231442

Related bugs:

Bug #1192442: [messaging-app] Not possible to select the text or open a link from a received message	Medium	Fix Released
Bug #1231442: [dialer app] Call log - icon for unknown number should be the default avatar	Undecided	Fix Released
Bug #1231569: [messaging app] Toolbar label for 'Add contact' in messaging thread should be 'Add'	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-09-27
Gustavo Pichorim Boiko (community)		2013-09-27	Approve on 2013-09-27
Review via email: mp+188088@code.launchpad.net

Commit message

Replace the "new contact" icon used for unknown contacts on the conversations list by the default avatar.
Remove popup when tapping unknown contact avatars and implement a dialog for adding new contacts.

Description of the change

Replace the "new contact" icon used for unknown contacts on the conversations list by the default avatar.
Remove popup when tapping unknown contact avatars and implement a dialog for adding new contacts.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-27:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/messaging-app-ci/59/rebuild

review: Approve (continuous-integration)

lp:~tiagosh/messaging-app/fix-1231442 updated on 2013-09-27

41. By Tiago Salem Herrmann on 2013-09-27: Change label

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-09-27:

#

Looks good and works fine!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-27:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/messaging-app-ci/60/rebuild

review: Approve (continuous-integration)

 === modified file 'src/qml/Messages.qml'
 --- src/qml/Messages.qml	2013-09-25 17:07:07 +0000
 +++ src/qml/Messages.qml	2013-09-27 17:28:42 +0000
@@ -51,6 +51,32 @@
          return eventModel.markEventAsRead(accountId, threadId, eventId, type);
+     }
++    Component {
++         id: newContactDialog
++         Dialog {
++             id: dialogue
++             title: i18n.tr("Save contact")
++             text: i18n.tr("How do you want to save the contact?")
++             Button {
++                 text: i18n.tr("Add to existing contact")
++                 color: UbuntuColors.orange
++                 onClicked: {
++                     PopupUtils.open(addPhoneNumberToContactSheet)
++                     PopupUtils.close(dialogue)
++                 }
++             }
++             Button {
++                 text: i18n.tr("Create new contact")
++                 color: UbuntuColors.warmGrey
++                 onClicked: {
++                     applicationUtils.switchToAddressbookApp("addressbook://create" +
++                                                             "?phone=" + encodeURIComponent(contactWatcher.phoneNumber))
++                     PopupUtils.close(dialogue)
++                 }
++             }
++         }
++    }
++
      ContactWatcher {
          id: contactWatcher
+     }
@@ -60,7 +86,36 @@
+     }
      Component {
--        id: contactsSheet
++        id: addPhoneNumberToContactSheet
++        DefaultSheet {
++            // FIXME: workaround to set the contact list
++            // background to black
++            Rectangle {
++                anchors.fill: parent
++                anchors.margins: -units.gu(1)
++                color: "#221e1c"
++            }
++            id: sheet
++            title: "Add Contact"
++            doneButton: false
++            modal: true
++            contentsHeight: parent.height
++            contentsWidth: parent.width
++            ContactListView {
++                anchors.fill: parent
++                onContactClicked: {
++                    applicationUtils.switchToAddressbookApp("addressbook://addphone" +
++                                                            "?id=" + encodeURIComponent(contact.contactId) +
++                                                            "&phone=" + encodeURIComponent(contactWatcher.phoneNumber))
++                    PopupUtils.close(sheet)
++                }
++            }
++            onDoneClicked: PopupUtils.close(sheet)
++        }
++    }
++
++    Component {
++        id: addContactToConversationSheet
          DefaultSheet {
              // FIXME: workaround to set the contact list
              // background to black
@@ -110,9 +165,9 @@
              objectName: "addContactButton"
              action: Action {
                  iconSource: Qt.resolvedUrl("assets/new-contact.svg")
--                text: i18n.tr("Add contact")
++                text: i18n.tr("Add")
                  onTriggered: {
--                    applicationUtils.switchToAddressbookApp("create://" + contactWatcher.phoneNumber)
++                    PopupUtils.open(newContactDialog)
                      messagesToolbar.opened = false
+                 }
+             }
@@ -124,7 +179,7 @@
                  iconSource: Qt.resolvedUrl("assets/contact.svg")
                  text: i18n.tr("Contact")
                  onTriggered: {
--                    applicationUtils.switchToAddressbookApp("contact://" + contactWatcher.contactId)
++                    applicationUtils.switchToAddressbookApp("addressbook://contact?id=" + encodeURIComponent(contactWatcher.contactId))
                      messagesToolbar.opened = false
+                 }
+             }
@@ -225,7 +280,7 @@
              source: Qt.resolvedUrl("assets/new-contact.svg")
              MouseArea {
                  anchors.fill: parent
--                onClicked: PopupUtils.open(contactsSheet)
++                onClicked: PopupUtils.open(addContactToConversationSheet)
+             }
+         }
+     }
 === modified file 'src/qml/ThreadDelegate.qml'
 --- src/qml/ThreadDelegate.qml	2013-09-09 18:43:24 +0000
 +++ src/qml/ThreadDelegate.qml	2013-09-27 17:28:42 +0000
@@ -46,32 +46,11 @@
          image: Image {
              anchors.fill: parent
              source: {
--                if(!unknownContact) {
--                    if (delegateHelper.avatar != "") {
--                        return delegateHelper.avatar
--                    }
--                    return Qt.resolvedUrl("assets/avatar-default.png")
--                }
--                return Qt.resolvedUrl("assets/new-contact.svg")
--            }
--        }
--        MouseArea {
--            anchors.fill: avatar
--            onClicked: {
--                mainView.newPhoneNumber = delegateHelper.phoneNumber
--                if (selectionMode) {
--                    delegate.clicked()
--                } else {
--                    PopupUtils.open(newcontactPopover, avatar)
--                }
--            }
--            onPressAndHold: {
--                mainView.newPhoneNumber = delegateHelper.phoneNumber
--                if (!selectionMode) {
--                    PopupUtils.open(newcontactPopover, avatar)
--                }
--            }
--            enabled: unknownContact
++                if(!unknownContact && delegateHelper.avatar !== "") {
++                    return delegateHelper.avatar
++                }
++                return Qt.resolvedUrl("assets/avatar-default.png")
++            }
+         }
+     }

messaging-app

Merge lp:~tiagosh/messaging-app/fix-1231442 into lp:messaging-app

Commit message

Description of the change

Preview Diff

Subscribers