Merge lp:~renatofilho/address-book-app/fix-1411323-rtm into lp:address-book-app/rtm-14.09

[Renato Araujo Oliveira Filho]

Use the "tick" icon as confirm button while in Pick mode.

[Renato Araujo Oliveira Filho (renatofilho)]

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? YES

If you changed UI labels, did you update the pot file? NO LABEL CHANGED

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

[lp:~renatofilho/address-book-app/fix-1411323-rtm]

292. By Renato Araujo Oliveira Filho on 2015-01-22

Added unit test for "share" button icon.

293. By Renato Araujo Oliveira Filho on 2015-01-22

Fixed icon name on comments.

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-12-04 13:18:23 +0000
+++ src/imports/ContactList/ContactListPage.qml	2015-01-22 16:04:59 +0000
@@ -421,7 +421,7 @@
                 Action {
                     objectName: "share"
                     text: i18n.tr("Share")
-                    iconName: "share"
+                    iconName: mainPage.pickMode ? "tick" : "share"
                     visible: contactList.isInSelectionMode
                     onTriggered: {
                         var contacts = []
 
=== modified file 'tests/qml/tst_ContactList.qml'
--- tests/qml/tst_ContactList.qml	2014-12-04 13:18:23 +0000
+++ tests/qml/tst_ContactList.qml	2015-01-22 16:04:59 +0000
@@ -88,7 +88,7 @@
 
         function cleanup()
         {
-            root.contactListPageObj.destroy()
+            root.contactListPageObj = null
         }
 
         function test_title()
@@ -137,5 +137,64 @@
             tryCompare(dialog.item, "dialogVisible", false)
         }
 
+        function test_pickButtonIcon()
+        {
+            tryCompare(root.contactListPageObj, "state", "default")
+            var activeActions = root.contactListPageObj.head.actions
+
+
+            // before start the pick mode the action is not visible
+            for(var i = 0; i < activeActions.length; i++) {
+                if (activeActions[i].objectName === "share")
+                    fail("Share icon is visible but the list is not in selection mode")
+            }
+
+            // start selection
+            var view = findChild(root.contactListPageObj, "contactListView")
+            view.startSelection()
+            tryCompare(root.contactListPageObj, "state", "selection")
+
+            // on selection mode the share shuld be visible and using the 'share' icon
+            var shareAction = null
+            activeActions = root.contactListPageObj.head.actions
+            for(var i = 0; i < activeActions.length; i++) {
+                if (activeActions[i].objectName === "share") {
+                    shareAction = activeActions[i]
+                    break
+                }
+            }
+            verify(shareAction != null, "Share button is not visible while the list is in selection mode")
+            tryCompare(shareAction, "visible",  true)
+            tryCompare(shareAction, "iconName", "share")
+
+            // cancel selection
+            view.cancelSelection()
+
+            // check if the list went back to default state
+            tryCompare(root.contactListPageObj, "state", "default")
+            activeActions = root.contactListPageObj.head.actions
+            for(var i = 0; i < activeActions.length; i++) {
+                if (activeActions[i].objectName === "share")
+                    fail("Share icon is visible but the list is not in selection mode")
+            }
+
+
+            // enter on pick mode
+            root.contactListPageObj.startPickMode(true, null)
+
+            // share button is visible and using the 'tick' icon
+            tryCompare(root.contactListPageObj, "state", "selection")
+            shareAction = null
+            activeActions = root.contactListPageObj.head.actions
+            for(var i = 0; i < activeActions.length; i++) {
+                if (activeActions[i].objectName === "share") {
+                    shareAction = activeActions[i]
+                    break
+                }
+            }
+            verify(shareAction != null, "Share button is not visible while the list is in pick mode")
+            tryCompare(shareAction, "visible",  true)
+            tryCompare(shareAction, "iconName", "tick")
+        }
     }
 }