Merge lp:~tiagosh/phone-app/phone-app-1185064 into lp:phone-app

[Tiago Salem Herrmann]

- Allow toggling favorite even when not editing a contact
- Increase the interaction area surrounding the favorite toggle

- Allow toggling favorite even when not editing a contact
- Increase the interaction area surrounding the favorite toggle

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:659
http://jenkins.qa.ubuntu.com/job/phone-app-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/101
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/101

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

review: Approve (continuous-integration)

[lp:~tiagosh/phone-app/phone-app-1185064]

660. By Tiago Salem Herrmann on 2013-05-29

revert method renaming.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:660
http://jenkins.qa.ubuntu.com/job/phone-app-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/102

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

works nice.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-28 22:49:25 +0000
+++ debian/changelog	2013-05-29 13:26:28 +0000
@@ -1,3 +1,9 @@
+phone-app (0.59.12-0ubuntu2) UNRELEASED; urgency=low
+
+  * Allow toggling favorite even when not editing a contact (LP: #1185064).
+
+ -- Tiago Salem Herrmann <[e-mail]>  Wed, 29 May 2013 00:10:30 -0300
+
 phone-app (0.59.12-0ubuntu1) raring; urgency=low
 
   * Added rotation support;

=== modified file 'src/qml/DetailViewContact/ContactDetails.qml'
--- src/qml/DetailViewContact/ContactDetails.qml	2013-05-27 17:54:18 +0000
+++ src/qml/DetailViewContact/ContactDetails.qml	2013-05-29 13:26:28 +0000
@@ -98,6 +98,7 @@
         editable: contactDetails.editable
         focus: true
         backgroundColor: "#ededed"
+        onFavoriteSaved: contactDetails.save()
     }
 
     function createNewContact(number) {

=== modified file 'src/qml/DetailViewContact/ContactDetailsHeader.qml'
--- src/qml/DetailViewContact/ContactDetailsHeader.qml	2013-03-21 17:12:14 +0000
+++ src/qml/DetailViewContact/ContactDetailsHeader.qml	2013-05-29 13:26:28 +0000
@@ -28,6 +28,7 @@
     property variant editable: false
     property alias contactNameValid: name.valid
     property color backgroundColor: "transparent"
+    signal favoriteSaved()
 
     width: parent.width
     // ensure that there is equal padding at the top and bottom of labelBox
@@ -74,9 +75,15 @@
         source: contact.isFavorite ? "../assets/favorite-selected.png" : "../assets/favorite-unselected.png"
 
         MouseArea {
-            enabled: editable
-            anchors.fill: parent
-            onClicked: contact.isFavorite = !contact.isFavorite
+            anchors.centerIn: parent
+            height: units.gu(3)
+            width: units.gu(3)
+            onClicked: {
+                contact.isFavorite = !contact.isFavorite
+                if (!editable) {
+                    contactDetailsHeader.favoriteSaved()
+                }
+            }
         }
     }