ubuntu-touch-coreapps-reviewers team mailing list archive

[Andrew Hayzen <ahayzen@xxxxxxxxx>]

Andrew Hayzen has proposed merging lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump into lp:ubuntu-weather-app.

Commit message:
* Update app to use the Ubuntu Components version 1.3

Requested reviews:
  Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot): continuous-integration
  Ubuntu Weather Developers (ubuntu-weather-dev)
Related bugs:
  Bug #1508363 in Ubuntu Weather App: "Coordinated migration to UITK 1.3"
  https://bugs.launchpad.net/ubuntu-weather-app/+bug/1508363

For more details, see:
https://code.launchpad.net/~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump/+merge/276466

* Update app to use the Ubuntu Components version 1.3

I think I've managed to tweak the FakeHeader and PageWithBottomEdge to match the new header height and styling requirements :-)

Please test AP locally as well.
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump into lp:ubuntu-weather-app.

=== modified file 'app/components/CurrentLocation.qml'
--- app/components/CurrentLocation.qml	2015-07-27 00:57:57 +0000
+++ app/components/CurrentLocation.qml	2015-11-02 21:31:20 +0000
@@ -19,7 +19,7 @@
 import QtLocation 5.3
 import QtPositioning 5.2
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../data/WeatherApi.js" as WeatherApi
 
 

=== modified file 'app/components/DayDelegate.qml'
--- app/components/DayDelegate.qml	2015-10-16 00:12:57 +0000
+++ app/components/DayDelegate.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListItem {
     id: dayDelegate

=== modified file 'app/components/DayDelegateExtraInfo.qml'
--- app/components/DayDelegateExtraInfo.qml	2015-09-29 15:21:55 +0000
+++ app/components/DayDelegateExtraInfo.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 Column {

=== modified file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml	2015-06-18 01:42:03 +0000
+++ app/components/ExpandableListItem.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*

=== modified file 'app/components/FakeHeader.qml'
--- app/components/FakeHeader.qml	2015-10-18 15:48:28 +0000
+++ app/components/FakeHeader.qml	2015-11-02 21:31:20 +0000
@@ -17,22 +17,22 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Column {
     id: fakeHeader
 
-    height: units.gu(9)
+    height: units.gu(6.125)
 
     Rectangle {
-        height: units.gu(7)
+        height: units.gu(6)
         width: parent.width
         color: Theme.palette.normal.background
     }
 
     Rectangle {
         color: "#C9C9C9"
-        height: units.gu(2)
+        height: units.gu(0.125)
         anchors.left: parent.left
         anchors.right: parent.right
     }

=== modified file 'app/components/FastScroll.qml'
--- app/components/FastScroll.qml	2015-06-18 01:42:03 +0000
+++ app/components/FastScroll.qml	2015-11-02 21:31:20 +0000
@@ -41,7 +41,7 @@
 
 // FastScroll.qml
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "FastScroll.js" as Sections
 
 Item {

=== modified file 'app/components/ForecastDetailsDelegate.qml'
--- app/components/ForecastDetailsDelegate.qml	2015-10-09 18:35:21 +0000
+++ app/components/ForecastDetailsDelegate.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Row {
     height: icon.height

=== modified file 'app/components/HeaderRow.qml'
--- app/components/HeaderRow.qml	2015-07-27 21:41:09 +0000
+++ app/components/HeaderRow.qml	2015-11-02 21:31:20 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 RowLayout {
     id: headerRow

=== modified file 'app/components/HomeGraphic.qml'
--- app/components/HomeGraphic.qml	2015-06-18 01:42:03 +0000
+++ app/components/HomeGraphic.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     height: units.gu(32)

=== modified file 'app/components/HomeHourly.qml'
--- app/components/HomeHourly.qml	2015-08-20 19:47:45 +0000
+++ app/components/HomeHourly.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListView {
     id: homeHourly

=== modified file 'app/components/HomePageEmptyStateComponent.qml'
--- app/components/HomePageEmptyStateComponent.qml	2015-07-30 04:10:44 +0000
+++ app/components/HomePageEmptyStateComponent.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 

=== modified file 'app/components/HomeTempInfo.qml'
--- app/components/HomeTempInfo.qml	2015-10-16 00:14:28 +0000
+++ app/components/HomeTempInfo.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: homeTempInfoItem

=== modified file 'app/components/ListItemActions/CheckBox.qml'
--- app/components/ListItemActions/CheckBox.qml	2015-06-18 01:45:57 +0000
+++ app/components/ListItemActions/CheckBox.qml	2015-11-02 21:31:20 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 CheckBox {
     checked: root.selected

=== modified file 'app/components/ListItemActions/Remove.qml'
--- app/components/ListItemActions/Remove.qml	2015-06-18 01:42:03 +0000
+++ app/components/ListItemActions/Remove.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Action {
     id: removeAction

=== modified file 'app/components/ListItemReorderComponent.qml'
--- app/components/ListItemReorderComponent.qml	2015-06-18 01:42:03 +0000
+++ app/components/ListItemReorderComponent.qml	2015-11-02 21:31:20 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 Item {

=== modified file 'app/components/ListItemWithActions.qml'
--- app/components/ListItemWithActions.qml	2015-06-18 01:42:03 +0000
+++ app/components/ListItemWithActions.qml	2015-11-02 21:31:20 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 

=== modified file 'app/components/LoadingIndicator.qml'
--- app/components/LoadingIndicator.qml	2015-06-18 01:42:03 +0000
+++ app/components/LoadingIndicator.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: indicator

=== modified file 'app/components/LocationsPageEmptyStateComponent.qml'
--- app/components/LocationsPageEmptyStateComponent.qml	2015-07-30 04:10:44 +0000
+++ app/components/LocationsPageEmptyStateComponent.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 

=== modified file 'app/components/MultiSelectHeadState.qml'
--- app/components/MultiSelectHeadState.qml	2015-06-18 01:42:03 +0000
+++ app/components/MultiSelectHeadState.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 PageHeadState {
     id: selectionState

=== modified file 'app/components/MultiSelectListView.qml'
--- app/components/MultiSelectListView.qml	2015-06-18 01:42:03 +0000
+++ app/components/MultiSelectListView.qml	2015-11-02 21:31:20 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 WeatherListView {

=== modified file 'app/components/NetworkErrorStateComponent.qml'
--- app/components/NetworkErrorStateComponent.qml	2015-10-19 03:05:53 +0000
+++ app/components/NetworkErrorStateComponent.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 

=== modified file 'app/components/PageWithBottomEdge.qml'
--- app/components/PageWithBottomEdge.qml	2015-10-18 15:48:28 +0000
+++ app/components/PageWithBottomEdge.qml	2015-11-02 21:31:20 +0000
@@ -63,7 +63,7 @@
 */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Page {
     id: page
@@ -77,7 +77,8 @@
     property bool reloadBottomEdgePage: true
 
     readonly property alias bottomEdgePage: edgeLoader.item
-    readonly property bool isReady: ((bottomEdge.y === fakeHeader.height) && bottomEdgePageLoaded && edgeLoader.item.active) // CUSTOM change to flag to allow for FakeHeader height
+    // FIXME: 6.125 is the header.height
+    readonly property bool isReady: ((bottomEdge.y === units.gu(6.125)) && bottomEdgePageLoaded && edgeLoader.item.active) // CUSTOM change to flag to allow for FakeHeader height
     readonly property bool isCollapsed: (bottomEdge.y === page.height)
     readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
 
@@ -108,7 +109,7 @@
             edgeLoader.item.active = true
             page.pageStack.push(edgeLoader.item)
             if (edgeLoader.item.flickable) {
-                edgeLoader.item.flickable.contentY = -page.header.height
+                edgeLoader.item.flickable.contentY = -units.gu(6.125)  // FIXME: 6.125 is the header.height
                 edgeLoader.item.flickable.returnToBounds()
             }
             if (edgeLoader.item.ready)
@@ -278,7 +279,8 @@
             left: parent.left
             right: parent.right
         }
-        y: -fakeHeader.height + (fakeHeader.height * (page.height - bottomEdge.y)) / (page.height - fakeHeader.height)
+        // FIXME: 6.125 is the header.height
+        y: -units.gu(6.125) + (units.gu(6.125) * (page.height - bottomEdge.y)) / (page.height - units.gu(6.125))
         z: bgVisual.z + 1
 
         Behavior on y {
@@ -294,7 +296,7 @@
 
         readonly property int tipHeight: units.gu(3)
         // CUSTOM value
-        readonly property int pageStartY: fakeHeader.height
+        readonly property int pageStartY: units.gu(6.125)  // FIXME: 6.125 is the header.height
 
         z: 1
         color: Theme.palette.normal.background
@@ -318,7 +320,7 @@
                 // CUSTOM
                 PropertyChanges {
                     target: fakeHeader
-                    y: -fakeHeader.height
+                    y: -units.gu(6.125)  // FIXME: 6.125 is the header.height
                 }
             },
             State {
@@ -363,6 +365,7 @@
                             easing.type: Easing.Linear
                         }
                     }
+                    /*  // CUSTOM
                     SmoothedAnimation {
                         target: edgeLoader
                         property: "anchors.topMargin"
@@ -370,6 +373,7 @@
                         duration: UbuntuAnimation.FastDuration
                         easing.type: Easing.Linear
                     }
+                    */
                     SmoothedAnimation {
                         target: edgeLoader
                         property: "anchors.topMargin"
@@ -441,14 +445,19 @@
             id: edgeLoader
 
             asynchronous: true
-            anchors.fill: parent
+            anchors {
+                fill: parent
+                topMargin: units.gu(6.125)  // CUSTOM
+            }
             //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
+            /*  // CUSTOM
             Binding {
                 target: edgeLoader.status === Loader.Ready ? edgeLoader : null
                 property: "anchors.topMargin"
                 value:  edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
                 when: !page.isReady
             }
+            */
 
             onLoaded: {
                 tip.forceActiveFocus()

=== modified file 'app/components/SettingsButton.qml'
--- app/components/SettingsButton.qml	2015-09-05 00:03:33 +0000
+++ app/components/SettingsButton.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 AbstractButton {

=== modified file 'app/components/StandardListItem.qml'
--- app/components/StandardListItem.qml	2015-06-21 14:54:05 +0000
+++ app/components/StandardListItem.qml	2015-11-02 21:31:20 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListItem {
     id: listItem

=== modified file 'app/components/WeatherListItem.qml'
--- app/components/WeatherListItem.qml	2015-09-29 16:09:21 +0000
+++ app/components/WeatherListItem.qml	2015-11-02 21:31:20 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListItemWithActions {
     id: root

=== modified file 'app/components/WeatherListView.qml'
--- app/components/WeatherListView.qml	2015-06-18 01:42:03 +0000
+++ app/components/WeatherListView.qml	2015-11-02 21:31:20 +0000
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 
 ListView {

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-10-14 23:31:23 +0000
+++ app/ubuntu-weather-app.qml	2015-11-02 21:31:20 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import Qt.labs.settings 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "components"
 import "data" as Data
 import "data/WeatherApi.js" as WeatherApi

=== modified file 'app/ui/AddLocationPage.qml'
--- app/ui/AddLocationPage.qml	2015-09-02 23:36:17 +0000
+++ app/ui/AddLocationPage.qml	2015-11-02 21:31:20 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import "../components"
 import "../data/CitiesList.js" as Cities
 import "../data/WeatherApi.js" as WeatherApi
@@ -180,13 +180,15 @@
 
     ListView {
         id: locationList
+        anchors {
+            fill: parent
+            rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1) : 0
+            topMargin: units.gu(2)
+        }
+
         objectName: "locationList"
-
         clip: true
         currentIndex: -1
-        anchors.fill: parent
-        anchors.rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1)
-                                                : 0
 
         function getSectionText(index) {
             return citiesModel.get(index).name.substring(0,1)

=== modified file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml	2015-09-05 00:03:33 +0000
+++ app/ui/HomePage.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 
@@ -83,6 +83,12 @@
         return new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)
     }
 
+    // Do not show the Page Header
+    head {
+        locked: true
+        visible: false
+    }
+
     /*
       Background for the PageWithBottomEdge
     */

=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml	2015-10-22 15:17:02 +0000
+++ app/ui/LocationPane.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import "../components"
 import "../data/suncalc.js" as SunCalc

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-10-22 12:49:35 +0000
+++ app/ui/LocationsPage.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import "../components"
 import "../components/ListItemActions"
@@ -66,7 +66,7 @@
         anchors {
             fill: parent
             // TODO: Fix this offset
-            topMargin: locationsPage.header ? -locationsPage.header.height : 0
+            topMargin: -units.gu(6.125)  // FIXME: 6.125 is the header.height
         }
         model: ListModel {
             id: locationsModel

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2015-08-10 08:13:31 +0000
+++ app/ui/SettingsPage.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 Page {

=== modified file 'app/ui/settings/DataProviderPage.qml'
--- app/ui/settings/DataProviderPage.qml	2015-10-14 23:31:23 +0000
+++ app/ui/settings/DataProviderPage.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../components"
 import "../../data/keys.js" as Keys
 

=== modified file 'app/ui/settings/LocationPage.qml'
--- app/ui/settings/LocationPage.qml	2015-07-27 00:57:57 +0000
+++ app/ui/settings/LocationPage.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {

=== modified file 'app/ui/settings/RefreshIntervalPage.qml'
--- app/ui/settings/RefreshIntervalPage.qml	2015-06-21 14:54:05 +0000
+++ app/ui/settings/RefreshIntervalPage.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../components"
 
 Page {

=== modified file 'app/ui/settings/UnitsPage.qml'
--- app/ui/settings/UnitsPage.qml	2015-08-10 16:27:31 +0000
+++ app/ui/settings/UnitsPage.qml	2015-11-02 21:31:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../components"
 
 Page {

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-25 20:14:14 +0000
+++ debian/changelog	2015-11-02 21:31:20 +0000
@@ -70,6 +70,7 @@
   * Implement extra info expandable for today info (LP: #1496422, LP: #1478255)
   * Fix for autopilot tests not using custom back button and for possible flaky test due to expandHeight changing dynamically
   * Fix to link the Wind Speed unit to the Wind Unit setting and not the Temperature Unit setting
+  * Update app to use the Ubuntu Components version 1.3 (LP: #1508363)
 
   [ Carla Sella ]
   * Create autopilot test which shows the day delegate (LP: #1452491)

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-10-24 19:24:48 +0000
+++ manifest.json.in	2015-11-02 21:31:20 +0000
@@ -1,7 +1,7 @@
 {
     "architecture": "all",
     "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
-    "framework": "ubuntu-sdk-15.04-qml",
+    "framework": "ubuntu-sdk-15.04.1-qml",
     "hooks": {
         "weather": {
             "apparmor": "ubuntu-weather-app.apparmor",

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-10-25 20:12:50 +0000
+++ po/com.ubuntu.weather.pot	2015-11-02 21:31:20 +0000
@@ -8,7 +8,11 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2015-10-25 21:12+0100\n"
+=======
+"POT-Creation-Date: 2015-11-02 20:59+0000\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"

=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-10-22 12:49:35 +0000
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2015-11-02 21:31:20 +0000
@@ -130,7 +130,7 @@
         return header.select_single("TextField", objectName="searchField")
 
     def is_empty_label_visible(self):
-        return self.select_single("Label", objectName="noCity").visible
+        return self.select_single("UCLabel", objectName="noCity").visible
 
     def search(self, value):
         self.click_search_action()
@@ -308,7 +308,7 @@
 
 class WeatherListItem(UbuntuUIToolkitCustomProxyObjectBase):
     def get_name(self):
-        return self.select_single("Label", objectName="name").text
+        return self.select_single("UCLabel", objectName="name").text
 
     @click_object
     def select_remove(self):