Merge lp:~andrewsomething/ubuntu-weather-app/lp121890 into lp:ubuntu-weather-app/obsolete.trunk

[Andrew Starr-Bochicchio]

Increase visibility of ActivityIndicator while refreshing data using an UbuntuShape around it and moving above the weather info.

Increase visibility of ActivityIndicator while refreshing data using an UbuntuShape around it and moving above the weather info.

[Martin Borho (martin-borho)]

Well done! Thanks for contributing!

review: Approve

[Martin Borho (martin-borho)]

Found out, the tests are broken.

When you change Line 198 in ubuntu-weather-app.qml to "running: refresh.visible", everything should work again!

Cheers
Martin

review: Needs Fixing

[Andrew Starr-Bochicchio (andrewsomething)]

Ok, made that change, but I wasn't able to test the tests... How are you invoking the tests?

[Martin Borho (martin-borho)]

Go in tests/autopilot and use the command "autopilot run ubuntu_weather_app". Do "autopilot list ubuntu_weather_app" to get a list of all tests available.

Tutorial and the packages you need are described here: http://developer.ubuntu.com/resources/tutorials/quality/how-to-write-autopilot-tests/

[Martin Borho (martin-borho)]

Now everything works, thanks!

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~andrewsomething/ubuntu-weather-app/lp121890/+merge/186371/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Raúl Yeguas (neokore)]

Now it should merge. Thanks Andrew, good work!

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

review: Approve (continuous-integration)

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-09-03 13:13:29 +0000
+++ ubuntu-weather-app.qml	2013-09-18 15:40:12 +0000
@@ -110,7 +110,7 @@
         var locLength = locations.length,
             locBeforeLen = locationsList.length,
             focusToLast = (locBeforeLen > 0 && locLength > locBeforeLen) ? true : false;
-        loading.running = false;
+        refresh.visible = false;
         // show locationmanager when no location is added
         if(locLength === 0) {
             showLocationManager()
@@ -135,8 +135,7 @@
     }
 
     function refreshData(from_storage, force_refresh) {
-        loading.running = true;
-        //
+        refresh.visible = true;
         if(from_storage === true && force_refresh !== true) {
             storage.getLocations(buildTabs);
         } else {
@@ -180,12 +179,25 @@
         id:locationManager        
     }
 
-    ActivityIndicator{
-        id:loading
-        objectName: "LoadingSpinner"
-        running: false
-        z: 1
-        anchors.centerIn: parent
+    UbuntuShape {
+        id: refresh
+        height: units.gu(5)
+        width: units.gu(5)
+        color: "#90FFFFFF"
+        visible: false
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: parent.top
+            margins: units.gu(15)
+        }
+
+        ActivityIndicator {
+            id: loading
+            objectName: "LoadingSpinner"
+            anchors.centerIn: parent
+            running: refresh.visible
+            z: 1
+        }
     }
 
     Item {