Merge lp:~ahayzen/ubuntu-weather-app/reboot-fix-no-settings-button-empty-state into lp:ubuntu-weather-app

[Andrew Hayzen]

* Show settings button on empty state page
* Fix empty state page so that bottom edge animation is ontop

* Show settings button on empty state page
* Fix empty state page so that bottom edge animation is ontop

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:72
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/157/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/157

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/157/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

So I know these two things weren't introduced by this MP, but they are probably worth discussing and fixing here:

1. In the Empty State when location detection is off, the phrase "Searching for current location" is inaccurate. When location detection is off, we should probably say "Cannot determine your location" or similar.
2. Ideally we should also display the above when the user denies the request to share location with the app. But I'm not going to require that you do so under this MP.
3. IMO "Add a manual location" doesn't make a whole lot of sense. I think we should change this to "Manually add a location" or maybe even "Search for a location"

For the first two, I think eventually we should add a graphic to the Empty State to make this view more friendly. Something fun like this: http://i.imgur.com/XJC58qk.jpg

review: Needs Fixing

[Victor Thompson (vthompson)]

One more thing, I've suggested this before--but I think we should disable the bottom edge hint when the empty state is visible. One more reason why I think we should is that otherwise we'll want another empty state for that view. There's no additional actions the user can take from the bottom edge when the empty state is shown that they can't do from the empty state. So why have duplicate entry points and excessive empty states?

Or--and this is contradictory in a sense from what I just said-- maybe we should remove the button on this empty state and instead instruct the user how to use the bottom edge? Then we'd eventually want to add an empty state to that view as well.

I'm inclined to think that instructing the user to use the bottom edge in this case is the best option.

[Andrew Hayzen (ahayzen)]

I agree that the best option is to tell them to use the bottom edge, then we only have 1 single way to add locations.

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-no-settings-button-empty-state]

73. By Andrew Hayzen on 2015-07-29

* Remove add location button
* Change phrasing of manual add location
* Conditionally show searching location from detectCurrentLocation setting
* Fix padding and responsive views

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:73
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/162/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/132/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/162/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/162/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-no-settings-button-empty-state]

74. By Andrew Hayzen on 2015-07-29

* Fix autopilot tests

75. By Andrew Hayzen on 2015-07-29

* Merge of trunk

[Andrew Hayzen (ahayzen)]

1) Updated the text
2) We can investigate in a future mp
3) Updated the text

Removed add location button and text now states to use bottom edge.

I'm going to rebase the other AP branches to be based on this, so this should land before them please :-)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/163/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/133
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/163

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/163/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-no-settings-button-empty-state]

76. By Andrew Hayzen on 2015-07-29

* Fix changelog phrasing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/166/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/166

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/166/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

lgtm and the tests pass. Thanks! :)

review: Approve

=== added file 'app/components/EmptyStateComponent.qml'
--- app/components/EmptyStateComponent.qml	1970-01-01 00:00:00 +0000
+++ app/components/EmptyStateComponent.qml	2015-07-29 22:23:49 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import "../components"
+
+
+Item {
+    anchors {
+        fill: parent
+        margins: units.gu(2)
+    }
+
+    SettingsButton {
+        anchors {
+            right: parent.right
+            top: parent.top
+        }
+    }
+
+    Column {
+        anchors {
+            centerIn: parent
+        }
+        spacing: units.gu(4)
+        width: parent.width - units.gu(4)
+
+        Label {
+            id: emptyStateLabel
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+            }
+            horizontalAlignment: Text.AlignHCenter
+            text: settings.detectCurrentLoaction
+                  ? i18n.tr("Searching for current location...")
+                  : i18n.tr("Cannot determine your location")
+            width: parent.width
+            wrapMode: Text.WordWrap
+        }
+
+        Label {
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+            }
+            horizontalAlignment: Text.AlignHCenter
+            text: i18n.tr("Manually add a location by swiping up from the bottom of the display")
+            width: parent.width
+            wrapMode: Text.WordWrap
+        }
+    }
+}

=== modified file 'app/components/HeaderRow.qml'
--- app/components/HeaderRow.qml	2015-06-18 01:42:03 +0000
+++ app/components/HeaderRow.qml	2015-07-29 22:23:49 +0000
@@ -38,25 +38,7 @@
         verticalAlignment: Text.AlignVCenter
     }
 
-    AbstractButton {
+    SettingsButton {
         id: settingsButton
-        height: width
-        width: units.gu(4)
-
-        onClicked: mainPageStack.push(Qt.resolvedUrl("../ui/SettingsPage.qml"))
-
-        Rectangle {
-            anchors.fill: parent
-            color: Theme.palette.selected.background
-            visible: parent.pressed
-        }
-
-        Icon {
-            anchors.centerIn: parent
-            color: UbuntuColors.darkGrey
-            height: width
-            name: "settings"
-            width: units.gu(2.5)
-        }
     }
 }

=== added file 'app/components/SettingsButton.qml'
--- app/components/SettingsButton.qml	1970-01-01 00:00:00 +0000
+++ app/components/SettingsButton.qml	2015-07-29 22:23:49 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+
+
+AbstractButton {
+    id: settingsButton
+    height: width
+    width: units.gu(4)
+
+    onClicked: mainPageStack.push(Qt.resolvedUrl("../ui/SettingsPage.qml"))
+
+    Rectangle {
+        anchors.fill: parent
+        color: Theme.palette.selected.background
+        visible: parent.pressed
+    }
+
+    Icon {
+        anchors.centerIn: parent
+        color: UbuntuColors.darkGrey
+        height: width
+        name: "settings"
+        width: units.gu(2.5)
+    }
+}

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-07-27 00:57:57 +0000
+++ app/ubuntu-weather-app.qml	2015-07-29 22:23:49 +0000
@@ -172,30 +172,6 @@
         }
     }
 
-    Column {
-        anchors.centerIn: parent
-        spacing: units.gu(4)
-        visible: (locationsList == null || locationsList.length == 0) && mainPageStack.depth == 1
-        z: 1000
-
-        Label {
-            id: emptyStateLabel
-            anchors.horizontalCenter: parent.horizontalCenter
-            text: i18n.tr("Searching for current location...")
-        }
-
-        Button {
-            id: emptyStateButton
-            objectName: "emptyStateButton"
-
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            text: i18n.tr("Add a manual location")
-
-            onTriggered: mainPageStack.push(Qt.resolvedUrl("ui/AddLocationPage.qml"));
-        }
-    }
-
     Data.Storage {
         id: storage
 

=== modified file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml	2015-07-27 22:03:24 +0000
+++ app/ui/HomePage.qml	2015-07-29 22:23:49 +0000
@@ -185,4 +185,14 @@
     LoadingIndicator {
         id: loadingIndicator
     }
+
+    Loader {
+        active: (locationsList === null || locationsList.length === 0) && mainPageStack.depth === 1
+        anchors {
+            fill: parent
+        }
+        asynchronous: true
+        source: "../components/EmptyStateComponent.qml"
+        visible: status === Loader.Ready && active
+    }
 }

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-07-27 00:57:57 +0000
+++ app/ui/LocationsPage.qml	2015-07-29 22:23:49 +0000
@@ -25,6 +25,7 @@
 
 Page {
     id: locationsPage
+    objectName: "locationsPage"
     // Set to null otherwise the first delegate appears +header.height down the page
     flickable: null
     title: i18n.tr("Locations")

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-27 21:53:41 +0000
+++ debian/changelog	2015-07-29 22:23:49 +0000
@@ -13,6 +13,11 @@
   * Add setting to disable auto detecting location
   * When running under autopilot do not auto detect location
   * Fix for console error on startup if there are no locations
+  * Show settings button on empty state page
+  * Fix empty state page so that bottom edge animation is ontop
+  * Remove add location button
+  * Change phrasing of manual add location
+  * Conditionally show "searching for current location" depending on the detectCurrentLocation setting
 
  -- Victor Thompson <[e-mail]>  Mon, 01 Jun 2015 20:11:23 -0500
 

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-07-27 00:57:57 +0000
+++ po/com.ubuntu.weather.pot	2015-07-29 22:23:49 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-27 01:55+0100\n"
+"POT-Creation-Date: 2015-07-29 21:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -46,6 +46,18 @@
 msgid "Sunset"
 msgstr ""
 
+#: ../app/components/EmptyStateComponent.qml:51
+msgid "Searching for current location..."
+msgstr ""
+
+#: ../app/components/EmptyStateComponent.qml:52
+msgid "Cannot determine your location"
+msgstr ""
+
+#: ../app/components/EmptyStateComponent.qml:62
+msgid "Manually add a location by swiping up from the bottom of the display"
+msgstr ""
+
 #: ../app/components/HomeTempInfo.qml:38
 msgid "Today"
 msgstr ""
@@ -66,14 +78,6 @@
 msgid "Cancel selection"
 msgstr ""
 
-#: ../app/ubuntu-weather-app.qml:184
-msgid "Searching for current location..."
-msgstr ""
-
-#: ../app/ubuntu-weather-app.qml:193
-msgid "Add a manual location"
-msgstr ""
-
 #: ../app/ui/AddLocationPage.qml:29
 msgid "Select a city"
 msgstr ""

=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-07-23 00:36:06 +0000
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2015-07-29 22:23:49 +0000
@@ -6,9 +6,14 @@
 # by the Free Software Foundation.
 
 """ubuntu-weather-app tests and emulators - top level package."""
+from autopilot.introspection import dbus
+import logging
 from ubuntuuitoolkit import MainView, UbuntuUIToolkitCustomProxyObjectBase
 
 
+logger = logging.getLogger(__name__)
+
+
 class UbuntuWeatherAppException(Exception):
     """Exception raised when there's an error in the Weather App."""
 
@@ -39,10 +44,9 @@
         return self.main_view.wait_select_single(
             HomePage, objectName="homePage")
 
-    def click_add_location_button(self):
-        add_location_button = self.main_view.wait_select_single(
-            "Button", objectName="emptyStateButton")
-        self.app.pointing_device.click_object(add_location_button)
+    def get_locations_page(self):
+        return self.main_view.wait_select_single(
+            LocationsPage, objectName="locationsPage")
 
 
 class Page(UbuntuUIToolkitCustomProxyObjectBase):
@@ -56,6 +60,27 @@
     def __init__(self, *args):
         super(PageWithBottomEdge, self).__init__(*args)
 
+    def reveal_bottom_edge_page(self):
+        """Bring the bottom edge page to the screen"""
+
+        self.bottomEdgePageLoaded.wait_for(True)
+
+        try:
+            action_item = self.wait_select_single(objectName='bottomEdgeTip')
+            action_item.visible.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.5))
+            stop_y = start_y - (self.height * 0.7)
+
+            self.pointing_device.drag(start_x, start_y,
+                                      start_x, stop_y, rate=2)
+            self.isReady.wait_for(True)
+        except dbus.StateNotFoundError:
+            logger.error('BottomEdge element not found.')
+            raise
+
 
 class AddLocationPage(Page):
     """Autopilot helper for AddLocationPage."""
@@ -63,7 +88,7 @@
         super(AddLocationPage, self).__init__(*args)
 
 
-class HomePage(Page):
+class HomePage(PageWithBottomEdge):
     """Autopilot helper for HomePage."""
     def __init__(self, *args):
         super(HomePage, self).__init__(*args)
@@ -73,6 +98,12 @@
             "QQuickListView", objectName="locationPages").count
 
 
+class LocationsPage(Page):
+    """Autopilot helper for LocationsPage."""
+    def __init__(self, *args, **kwargs):
+        super(LocationsPage, self).__init__(*args, **kwargs)
+
+
 class MainView(MainView):
     """Autopilot custom proxy object for the MainView."""
     retry_delay = 0.2

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py	2015-07-18 19:08:21 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py	2015-07-29 22:23:49 +0000
@@ -25,11 +25,13 @@
         super(TestEmptyState, self).setUp()
 
     def test_add_location_button(self):
-        """ tests that the add location page is shown after the Add Location
-            button is clicked """
-
-        self.app.click_add_location_button()
-
-        add_location_page = self.app.get_add_location_page()
-
-        self.assertThat(add_location_page.visible, Eventually(Equals(True)))
+        """ tests that the add location page is shown after swiping up
+            the bottom edge"""
+
+        home_page = self.app.get_home_page()
+        home_page.visible.wait_for(True)
+        home_page.reveal_bottom_edge_page()
+
+        locations_page = self.app.get_locations_page()
+
+        self.assertThat(locations_page.visible, Eventually(Equals(True)))