Merge lp:~renatofilho/address-book-app/fix-bottom-edge into lp:address-book-app

[Renato Araujo Oliveira Filho]

Show a dark background while swiping the bottom edge page.
Fixed bottom edge animation to avoid it to disappear on second interaction.

[lp:~renatofilho/address-book-app/fix-bottom-edge]

508. By Renato Araujo Oliveira Filho on 2015-10-21

Merged: ~renatofilho/address-book-app/autopilot-and-sdk-1.3

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/969/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/272
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4755
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4752
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24446

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/fix-bottom-edge]

509. By Renato Araujo Oliveira Filho on 2015-10-22

Fixed font size for new UITK label.

510. By Renato Araujo Oliveira Filho on 2015-10-22

Use pageStack API on PageWithBottomEdge.

511. By Renato Araujo Oliveira Filho on 2015-10-22

Make the header invisible on contact share page.

512. By Renato Araujo Oliveira Filho on 2015-10-22

Does not show empty state message if contact editor is open.

Unmerged revisions

=== modified file 'src/imports/ABContactEditorPage.qml'
--- src/imports/ABContactEditorPage.qml	2015-10-21 21:37:17 +0000
+++ src/imports/ABContactEditorPage.qml	2015-10-21 21:37:17 +0000
@@ -27,6 +27,7 @@
 
     head.backAction: Action {
         objectName: "cancel"
+        name: "cancel"
 
         text: i18n.tr("Cancel")
         iconName: "back"
@@ -38,6 +39,7 @@
     head.actions: [
         Action {
             objectName: "save"
+            name: "save"
 
             text: i18n.tr("Save")
             iconName: "ok"

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-10-21 21:37:17 +0000
+++ src/imports/ABContactListPage.qml	2015-10-21 21:37:17 +0000
@@ -39,6 +39,7 @@
     property Page contactViewPage: null
     property Page contactEditorPage: null
 
+    readonly property bool bottomEdgePageOpened: bottomEdge.opened && bottomEdge.fullLoaded
     readonly property bool isEmpty: (contactList.count === 0)
     readonly property bool allowToQuit: (application.callbackApplication.length > 0)
     readonly property var contactModel: contactList.listModel ? contactList.listModel : null
@@ -574,12 +575,14 @@
 
     BottomEdge {
         id: bottomEdge
+        objectName: "bottomEdge"
 
         anchors.fill: parent
         contentComponent: pageStack.columns == 1 ? editorPageBottomEdge : emptyContact
         flickable: contactList
         iconName: "contact-new"
         enabled: !contactList.isInSelectionMode
+        backGroundEffectEnabled: pageStack.columns === 1
 
         // FIXME: this is a workaround for the lack of fully asynchronous loading
         // of Pages in AdaptativePageLayout

=== modified file 'src/imports/ABContactViewPage.qml'
--- src/imports/ABContactViewPage.qml	2015-10-21 21:37:17 +0000
+++ src/imports/ABContactViewPage.qml	2015-10-21 21:37:17 +0000
@@ -33,6 +33,8 @@
     head.actions: [
         Action {
             objectName: "share"
+            name: "share"
+
             text: i18n.tr("Share")
             iconName: "share"
             onTriggered: {
@@ -44,6 +46,8 @@
         },
         Action {
             objectName: "edit"
+            name: "edit"
+
             text: i18n.tr("Edit")
             iconName: "edit"
             onTriggered: {

=== modified file 'src/imports/BottomEdge.qml'
--- src/imports/BottomEdge.qml	2015-10-21 21:37:17 +0000
+++ src/imports/BottomEdge.qml	2015-10-21 21:37:17 +0000
@@ -20,10 +20,15 @@
 Item {
     id: bottomEdge
 
+    readonly property alias content: bottomEdgeLoader.item
+    readonly property bool fullLoaded: bottomEdgeLoader.status == Loader.Ready
+
+    property bool opened: false
     property Component contentComponent
-    property Item content: bottomEdgeLoader.item
     property string iconName
     property Item flickable
+    property alias backGroundEffectEnabled: darkBg.visible
+
     signal openBegin
     signal openEnd
     signal clicked
@@ -37,6 +42,17 @@
         bottomEdge.state = "collapsed";
     }
 
+    Rectangle {
+        id: darkBg
+
+        anchors.fill: parent
+        color: "black"
+        opacity: bottomEdgeBody.y > 0 ? 0.8 - (bottomEdgeBody.y / bottomEdgeDragArea.drag.maximumY) : 0.8
+        Behavior on opacity {
+            NumberAnimation { duration: UbuntuAnimation.FastDuration }
+        }
+    }
+
     Item {
         id: bottomEdgeBody
         anchors {
@@ -82,6 +98,7 @@
 
         BottomEdgeHint {
             id: bottomEdgeHint
+
             anchors.bottom: bottomEdgeBody.top
             iconName: bottomEdge.iconName
             onClicked: bottomEdge.clicked()
@@ -117,13 +134,19 @@
     states: [
         State {
             name: "collapsed"
+            ParentChange {
+                target: bottomEdgeContent
+                parent: bottomEdgeBody
+                x: 0
+                y: 0
+            }
             PropertyChanges {
                 target: bottomEdgeBody
                 y: bottomEdgeDragArea.drag.maximumY
             }
             PropertyChanges {
                 target: bottomEdgeContent
-                visible: false
+                opacity: 0.0
             }
         },
         State {
@@ -135,9 +158,12 @@
                 y: 0
             }
             PropertyChanges {
+                target: bottomEdgeContent
+                opacity: 1.0
+            }
+            PropertyChanges {
                 target: bottomEdgeBody
-                y: bottomEdgeDragArea.drag.maximumY
-                opacity: 0.0
+                y: 0
             }
             PropertyChanges {
                 target: bottomEdgeShadows
@@ -150,7 +176,7 @@
             when: bottomEdgeDragArea.drag.active
             PropertyChanges {
                 target: bottomEdgeContent
-                visible: true
+                opacity: 1.0
             }
         }
     ]
@@ -160,16 +186,29 @@
             to: "collapsed"
             SequentialAnimation {
                 alwaysRunToEnd: true
-
-                SmoothedAnimation {
-                    target: bottomEdgeBody
-                    property: "y"
-                    duration: UbuntuAnimation.SlowDuration
+                ParallelAnimation {
+                    ParentAnimation {
+                        UbuntuNumberAnimation {
+                            properties: "x,y"
+                            duration: UbuntuAnimation.SlowDuration
+                            target: bottomEdgeContent
+                        }
+                    }
+                    UbuntuNumberAnimation {
+                        target: bottomEdgeBody
+                        property: "y"
+                        duration: UbuntuAnimation.SlowDuration
+                    }
+                }
+                PropertyAction {
+                    target: bottomEdgeContent
+                    property: "opacity"
                 }
                 ScriptAction {
                     script: {
-                        bottomEdgeLoader.active = false;
-                        bottomEdgeLoader.active = true;
+                        bottomEdgeLoader.active = false
+                        bottomEdgeLoader.active = true
+                        bottomEdge.opened = false
                     }
                 }
             }
@@ -177,6 +216,7 @@
         Transition {
             to: "expanded"
             SequentialAnimation {
+                alwaysRunToEnd: true
                 ParallelAnimation {
                     ScriptAction {
                         script: bottomEdge.openBegin()
@@ -200,7 +240,11 @@
                     duration: UbuntuAnimation.FastDuration
                 }
                 ScriptAction {
-                    script: bottomEdge.openEnd()
+                    script: {
+                        bottomEdge.opened = true
+                        bottomEdge.openEnd()
+                    }
+
                 }
             }
         }
@@ -208,6 +252,7 @@
 
     MouseArea {
         id: bottomEdgeDragArea
+        objectName: "bottomEdgeDragArea"
 
         property real previousY: -1
         property string dragDirection: "None"

=== modified file 'tests/autopilot/address_book_app/__init__.py'
--- tests/autopilot/address_book_app/__init__.py	2015-10-21 21:37:17 +0000
+++ tests/autopilot/address_book_app/__init__.py	2015-10-21 21:37:17 +0000
@@ -32,7 +32,6 @@
 from address_book_app import pages
 from address_book_app import address_book
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -65,30 +64,18 @@
         # ContactListPage is the only page that can appears multiple times
         # Ex.: During the pick mode we alway push a new contactListPage, to
         # preserve the current application status.
-        contact_list_pages = self.select_many(
-            pages.ABContactListPage, objectName='contactListPage')
-
-        # alway return the page without pickMode
-        for p in contact_list_pages:
-            if not p.pickMode:
-                return p
-        return None
+        return self.wait_select_single(pages.ABContactListPage,
+                                       objectName='contactListPage', pickMode=False)
 
     def get_contact_edit_page(self):
         # We can have two contact editor page because of bottom edge page
         # but we will return only the active one
-        list_page = self.get_contact_list_page()
-        list_page.bottomEdgePageLoaded.wait_for(True)
-        contact_editor_pages = self.select_many(
-            pages.ABContactEditorPage, objectName="contactEditorPage")
-        for p in contact_editor_pages:
-            if p.active:
-                return p
-        raise exceptions.StateNotFoundError('contactEditorPage not found')
+        return self.wait_select_single(objectName="contactEditorPage", active=True)
 
     def get_contact_view_page(self):
         return self.wait_select_single(pages.ABContactViewPage,
-                                       objectName="contactViewPage")
+                                       objectName="contactViewPage",
+                                       active=True)
 
     def get_contact_list_pick_page(self):
         contact_list_pages = self.select_many(
@@ -100,10 +87,10 @@
 
     def get_share_page(self):
         return self.wait_select_single("ContactSharePage",
-                                       objectName="contactSharePage")
+                                       objectName="contactSharePage",
+                                       active=True)
 
     def start_import_contacts(self):
-        self.open_header()
         view = self.get_contact_list_view()
         if view.count > 0:
             self.click_action_button("importFromSimHeaderButton")
@@ -114,19 +101,37 @@
             self.pointing_device.click_object(import_buttom)
 
         return self.wait_select_single(address_book.SIMCardImportPage,
-                                       objectName="simCardImportPage")
+                                       objectName="simCardImportPage",
+                                       active=True)
 
     def get_contact_list_view(self):
         """
-        Returns a ContactListView iobject for the current window
+        Returns a ContactListView object for the current window
         """
         return self.wait_select_single("ContactListView",
                                        objectName="contactListView")
 
-    def get_button(self, buttonName):
-        actionbar = self.select_single('ActionBar', objectName='headerActionBar')
-        return actionbar._get_action_button(buttonName)
+    def get_action(self, action_name):
+        actionbars = self.select_many('ActionBar', objectName='headerActionBar')
+        for actionbar in actionbars:
+            object_name = action_name + "_action_button"
+            try:
+                button = actionbar.select_single(objectName=object_name)
+                if button:
+                    return button
+            except introspection.dbus.StateNotFoundError:
+                continue
+        return None
 
+    def click_action_button(self, action_name):
+        actionbars = self.select_many('ActionBar', objectName='headerActionBar')
+        for actionbar in actionbars:
+            try:
+                actionbar.click_action_button(action_name)
+                return
+            except ubuntuuitoolkit.ToolkitException:
+                continue
+        raise exceptions.StateNotFoundError('Action %s not found.' % action_name)
 
     def open_header(self):
         header = self.get_header()
@@ -153,22 +158,36 @@
         """
         Press the 'Cancel' button
         """
-        header = self.open_header()
-        header.click_custom_back_button()
+        buttons = self.select_many(objectName='customBackButton')
+        for button in buttons:
+            if button.enabled and button.visible:
+                self.pointing_device.click_object(button)
+                return
+
+        #self.click_action_button("customBackButton")
 
     def save(self):
         """
         Press the 'Save' button
         """
-        bottom_swipe_page = self.get_contact_list_page()
         self.click_action_button("save")
-        bottom_swipe_page.isCollapsed.wait_for(True)
+
+    def edit(self):
+        """
+        Press the 'Save' button
+        """
+        self.click_action_button("edit")
+
+    def delete(self):
+        """
+        Press the 'Delete' button
+        """
+        self.click_action_button("delete")
 
     def confirm_import(self):
         """
         Press the 'confirm' button
         """
-        self.open_header()
         self.click_action_button("confirmImport")
 
     def get_toolbar(self):
@@ -182,4 +201,5 @@
         """
         bottom_swipe_page = self.get_contact_list_page()
         bottom_swipe_page.reveal_bottom_edge_page()
+
         return self.get_contact_edit_page()

=== modified file 'tests/autopilot/address_book_app/address_book/_contact_view_page.py'
--- tests/autopilot/address_book_app/address_book/_contact_view_page.py	2015-05-11 14:21:03 +0000
+++ tests/autopilot/address_book_app/address_book/_contact_view_page.py	2015-10-21 21:37:17 +0000
@@ -19,10 +19,4 @@
 
 class ContactViewPage(_common.PageWithHeader):
     """Autopilot helper for the ContactView page."""
-
-    def go_to_edit_contact(self):
-        self.get_header().click_action_button('edit')
-        return self.get_root_instance().select_single(
-            _contact_editor_page.ContactEditorPage,
-            objectName='contactEditorPage',
-            active=True)
+    pass

=== modified file 'tests/autopilot/address_book_app/address_book/_sim_card_import_page.py'
--- tests/autopilot/address_book_app/address_book/_sim_card_import_page.py	2015-05-12 15:43:25 +0000
+++ tests/autopilot/address_book_app/address_book/_sim_card_import_page.py	2015-10-21 21:37:17 +0000
@@ -72,7 +72,7 @@
         """Return a list with the names of the contacts."""
         contact_delegates = self._get_sorted_contact_delegates()
         name_labels = [
-            delegate.select_single('Label', objectName='nameLabel') for
+            delegate.select_single('UCLabel', objectName='nameLabel') for
             delegate in contact_delegates
         ]
         return [label.text for label in name_labels]
@@ -96,6 +96,6 @@
                 contact = self._get_contact_delegate(index)
                 self.pointing_device.click_object(contact)
                 contacts.append(contact.select_single(
-                    'Label', objectName='nameLabel').text)
+                    'UCLabel', objectName='nameLabel').text)
 
         return contacts

=== modified file 'tests/autopilot/address_book_app/pages/_ab_contact_list_page.py'
--- tests/autopilot/address_book_app/pages/_ab_contact_list_page.py	2015-05-13 13:25:18 +0000
+++ tests/autopilot/address_book_app/pages/_ab_contact_list_page.py	2015-10-21 21:37:17 +0000
@@ -21,9 +21,9 @@
 
 import autopilot.logging
 import ubuntuuitoolkit
-
 import address_book_app.address_book as address_book
 
+from autopilot.introspection import dbus
 from address_book_app.pages import ABContactViewPage
 
 
@@ -32,7 +32,7 @@
 log_action_debug = autopilot.logging.log_action(logging.debug)
 
 
-class ABContactListPage(address_book.PageWithHeader, address_book.PageWithBottomEdge):
+class ABContactListPage(address_book.PageWithHeader):
 
     """Autopilot helper for the Contact List page."""
 
@@ -46,8 +46,10 @@
         """
         contact_delegate = self._get_contact_delegate(index)
         self.pointing_device.click_object(contact_delegate)
+        # WORKAROUND: give some time to the view became available
+        time.sleep(5.0)
         return self.get_root_instance().select_single(
-            ABContactViewPage, objectName='contactViewPage')
+            ABContactViewPage, objectName='contactViewPage', active=True)
 
     def _get_contact_delegate(self, index):
         contact_delegates = self._get_sorted_contact_delegates()
@@ -108,9 +110,9 @@
             'ContactListView', objectName='contactListView')
 
     @log_action_info
-    def delete_selected_contacts(self):
-        self.get_header().click_action_button('delete')
-        self.isCollapsed.wait_for(True)
+    def delete_selected_contacts(self, main_window):
+        main_window.delete()
+        self.bottomEdgePageOpened.wait_for(False)
         dialog = self.get_root_instance().wait_select_single(
             address_book.RemoveContactsDialog, objectName='removeContactsDialog')
         dialog.confirm_removal()
@@ -119,7 +121,7 @@
         """Return a list with the names of the contacts."""
         contact_delegates = self._get_sorted_contact_delegates()
         name_labels = [
-            delegate.select_single('Label', objectName='nameLabel') for
+            delegate.select_single('UCLabel', objectName='nameLabel') for
             delegate in contact_delegates
         ]
         return [label.text for label in name_labels]
@@ -136,3 +138,20 @@
             objectName='contactListView.importFromSimCardButton')
         return import_from_sim_button.visible
 
+    def reveal_bottom_edge_page(self):
+        """Bring the bottom edge page to the screen"""
+        self.bottomEdgePageOpened.wait_for(False)
+        try:
+            action_item = self.wait_select_single(objectName='bottomEdgeDragArea')
+            action_item.enabled.wait_for(True)
+            start_x = (action_item.globalRect.x +
+                       (action_item.globalRect.width * 0.5))
+            start_y = action_item.globalRect.y + (action_item.height * 0.2)
+            stop_y = start_y - (self.height * 0.7)
+            self.pointing_device.drag(
+                start_x, start_y, start_x, stop_y, rate=2)
+            #self pointer became invalid at this point
+            #self.bottomEdgePageOpened.wait_for(True)
+        except dbus.StateNotFoundError:
+            logger.error('ButtomEdge element not found.')
+            raise

=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
--- tests/autopilot/address_book_app/tests/__init__.py	2015-04-14 22:19:01 +0000
+++ tests/autopilot/address_book_app/tests/__init__.py	2015-10-21 21:37:17 +0000
@@ -169,12 +169,12 @@
         list_page = self.main_window.get_contact_list_page()
         list_page.open_contact(index)
 
-        self.assertThat(list_page.visible, Eventually(Equals(False)))
         view_page = self.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # Edit contact
-        edit_page = view_page.go_to_edit_contact()
+        self.main_window.edit()
+        edit_page = self.main_window.get_contact_edit_page()
         self.assertThat(edit_page.visible, Eventually(Equals(True)))
 
         return edit_page

=== modified file 'tests/autopilot/address_book_app/tests/test_add_contact.py'
--- tests/autopilot/address_book_app/tests/test_add_contact.py	2015-05-12 15:43:25 +0000
+++ tests/autopilot/address_book_app/tests/test_add_contact.py	2015-10-21 21:37:17 +0000
@@ -36,14 +36,17 @@
         contact_editor = self.app.main_window.go_to_add_contact()
 
         # Check if the contact list disapear and contact editor appears
-        self.assertThat(list_page.visible, Eventually(Equals(False)))
+        #FIXME: list_page became an invalid pointer after push a new page
+        #self.assertThat(list_page.bottomEdgePageOpened, Eventually(Equals(True)))
         self.assertThat(contact_editor.visible, Eventually(Equals(True)))
+        self.assertThat(contact_editor.active, Eventually(Equals(True)))
 
         # cancel new contact without save
         self.app.main_window.cancel()
 
         # Check if the contact list is visible again
         self.assertThat(list_page.visible, Eventually(Equals(True)))
+        self.assertThat(list_page.bottomEdgePageOpened, Eventually(Equals(False)))
 
         # Check if the contact list still empty
         list_view = self.app.main_window.get_contact_list_view()
@@ -115,11 +118,11 @@
         # Check if they have the correct label
         for idx in range(3):
             email_type = view_page.select_single(
-                "Label",
+                "UCLabel",
                 objectName="type_email_" + str(idx))
 
             email_label = view_page.select_single(
-                "Label",
+                "UCLabel",
                 objectName="label_emailAddress_" + str(idx) + ".0")
 
             self.assertThat(emails[email_label.text], Equals(email_type.text))
@@ -166,11 +169,11 @@
         # Check if they have the correct label
         for idx in range(5):
             phone_type = view_page.select_single(
-                "Label",
+                "UCLabel",
                 objectName="type_phoneNumber_" + str(idx))
 
             phone_label = view_page.select_single(
-                "Label",
+                "UCLabel",
                 objectName="label_phoneNumber_" + str(idx) + ".0")
 
             self.assertThat(phones[phone_label.text], Equals(phone_type.text))

=== modified file 'tests/autopilot/address_book_app/tests/test_create_new_from_uri.py'
--- tests/autopilot/address_book_app/tests/test_create_new_from_uri.py	2014-09-02 19:23:05 +0000
+++ tests/autopilot/address_book_app/tests/test_create_new_from_uri.py	2015-10-21 21:37:17 +0000
@@ -23,16 +23,17 @@
 
     def test_save_new_contact(self):
         list_page = self.app.main_window.get_contact_list_page()
-        list_page.isReady.wait_for(True)
+        #FIXME: contacts list object became invalid after push a new page
+        #list_page.bottomEdgePageOpened.wait_for(True)
 
         edit_page = self.app.main_window.get_contact_edit_page()
         self.assertThat(edit_page.visible, Eventually(Equals(True)))
 
         # add name to the contact
-        firstNameField = self.app.main_window.wait_select_single(
+        firstNameField = edit_page.wait_select_single(
             "TextInputDetail",
             objectName="firstName")
-        lastNameField = self.app.main_window.wait_select_single(
+        lastNameField = edit_page.wait_select_single(
             "TextInputDetail",
             objectName="lastName")
 
@@ -43,6 +44,7 @@
         self.app.main_window.save()
 
         # open contact view
+        list_page = self.app.main_window.get_contact_list_page()
         list_page.open_contact(0)
         view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
@@ -53,10 +55,10 @@
             objectName="phones")
         self.assertThat(phone_group.detailsCount, Eventually(Equals(1)))
         phone_type = view_page.select_single(
-            "Label",
+            "UCLabel",
             objectName="type_phoneNumber_0")
         phone_label = view_page.select_single(
-            "Label",
+            "UCLabel",
             objectName="label_phoneNumber_0.0")
         self.assertThat(phone_label.text, Eventually(Equals("1234567890")))
         self.assertThat(phone_type.text, Eventually(Equals("Mobile")))

=== modified file 'tests/autopilot/address_book_app/tests/test_delete_contact.py'
--- tests/autopilot/address_book_app/tests/test_delete_contact.py	2014-09-02 19:23:05 +0000
+++ tests/autopilot/address_book_app/tests/test_delete_contact.py	2015-10-21 21:37:17 +0000
@@ -69,6 +69,6 @@
         if self.action == "cancel":
             self.app.main_window.cancel()
         elif self.action == "delete":
-            list_page.delete_selected_contacts()
+            list_page.delete_selected_contacts(self.app.main_window)
 
         self.assertEqual(list_page.get_contacts(), self.expected_result)

=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2015-05-12 15:43:25 +0000
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2015-10-21 21:37:17 +0000
@@ -59,7 +59,7 @@
 
         # check if the new value is correct
         phone_label_1 = view_page.select_single(
-            "Label",
+            "UCLabel",
             objectName="label_phoneNumber_1.0")
         self.assertThat(phone_label_1.text,
                         Eventually(Equals(self.PHONE_NUMBERS[1])))
@@ -89,14 +89,14 @@
 
         # check if we have onlye one phone
         view_page = list_page.open_contact(0)
-        phone_group = view_page.select_single(
+        phone_group = self.main_window.wait_select_single(
             "ContactDetailGroupWithTypeView",
             objectName="phones")
         self.assertThat(phone_group.detailsCount, Eventually(Equals(1)))
 
         # check if the new value is correct
-        phone_label_1 = view_page.select_single(
-            "Label",
+        phone_label_1 = phone_group.wait_select_single(
+            "UCLabel",
             objectName="label_phoneNumber_0.0")
         self.assertThat(phone_label_1.text,
                         Eventually(Equals(self.PHONE_NUMBERS[1])))
@@ -119,14 +119,14 @@
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have a new email
-        email_group = view_page.select_single(
+        email_group = self.main_window.select_single(
             "ContactDetailGroupWithTypeView",
             objectName="emails")
         self.assertThat(email_group.detailsCount, Eventually(Equals(1)))
 
         # check if the new value is correct
-        email_label_1 = view_page.select_single(
-            "Label",
+        email_label_1 = email_group.select_single(
+            "UCLabel",
             objectName="label_emailAddress_0.0")
         self.assertThat(email_label_1.text,
                         Eventually(Equals("[e-mail]")))
@@ -146,7 +146,7 @@
 
         # check if the email list is empty
         view_page = self.app.main_window.get_contact_view_page()
-        emails_group = view_page.select_single(
+        emails_group = self.main_window.select_single(
             "ContactDetailGroupWithTypeView",
             objectName="emails")
         self.assertThat(emails_group.detailsCount, Eventually(Equals(0)))
@@ -168,7 +168,7 @@
 
         # check if is possible to save a contact without name
         self.app.main_window.save()
-        accept_button = self.app.main_window.get_button("save")
+        accept_button = self.app.main_window.get_action("save")
         self.assertThat(accept_button.enabled, Eventually(Equals(False)))
 
         # Cancel edit
@@ -213,6 +213,6 @@
 
         # check if the type was saved correct
         im_type = view_page.select_single(
-            "Label",
+            "UCLabel",
             objectName="type_onlineAccount_0")
         self.assertThat(im_type.text, Eventually(Equals("Aim")))