Merge lp:~martin-borho/ubuntu-weather-app/WindUnitsSetting into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

added option in settings to change the wind speed unit, fixes Bugs #1214934, #1218907 and #1190784

* added option in settings to change the wind speed unit, Bug #1214934
* added test for changing wind speed unit
* fixes Bug #1190784
* added missing icon, Bug #1218907
* fixed smaller Bug, selected units now also used in hourly forecasts

[lp:~martin-borho/ubuntu-weather-app/WindUnitsSetting]

105. By Martin Borho on 2013-08-30

added missing 12.png icon, fixes bug #1218907

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

PASSED: Continuous integration, rev:104
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/31/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/29

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:105
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/32/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/102
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/30

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

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

Great (and fast) work, Martin!

review: Approve

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-08-28 13:12:19 +0000
+++ components/CurrentWeather.qml	2013-08-30 13:31:38 +0000
@@ -20,7 +20,7 @@
     property int pressure
     property variant hourly
     property string tempScale: (mainView.settings["units"] === "imperial") ? "F" : "C"
-    property string speedScale: (mainView.settings["units"] === "imperial") ? "mph" : "km/h"
+    property string speedScale: (mainView.settings["wind_units"] === "mph") ? "mph" : "km/h"
     property string precipScale: (mainView.settings["units"] === "imperial") ? "in" : "mm"
 
     width: parent.width
@@ -78,7 +78,7 @@
                         if(movement > 1){
                             if(currentWeather.hourly.get(movement) !== undefined) {
                                 currentConditionIcon.condition = currentWeather.hourly.get(movement).icon;
-                                var temp = currentWeather.hourly.get(movement)["metric"].temp;
+                                var temp = currentWeather.hourly.get(movement)[mainView.settings["units"]].temp;
                                 currentConditionTempContent.currentTemp = temp;
                                 adjustBackground(Math.round(temp));
                                 var dateTime = new Date(currentWeather.hourly.get(movement).date);
@@ -141,6 +141,7 @@
                             height: units.gu(15)
 
                             Components.WeatherDetailComponent {
+                                objectName: "WindSpeedValue"
                                 value: currentWeather.windSpeed
                                 measure: i18n.tr("Wind speed")
                                 unit: currentWeather.speedScale + " " + currentWeather.windDir

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-08-28 13:06:39 +0000
+++ components/LocationTab.qml	2013-08-30 13:31:38 +0000
@@ -50,6 +50,7 @@
     Component.onCompleted: {
         var locData = mainView.locationsList[locationIndex],
             units = (mainView.settings.units === 'imperial') ? 'imperial' : 'metric',
+            wind_units = (mainView.settings.wind_units === 'mph') ? 'imperial' : 'metric',
             dailyForecasts = locData.data,
             dailyLength = dailyForecasts.length,
             todayForeCast = dailyForecasts[0];
@@ -80,6 +81,7 @@
             }else if(degrees >330 && degrees <= 360){
                 direction = "N";
             }
+            print(dailyForecasts[x].icon)
             dayForecastModel.append({
                 dateRel: "",//Tomorrow",
                 date: formatTimestamp(dailyForecasts[x].timestamp, 'dddd, dd MMMM yyyy'),
@@ -90,7 +92,7 @@
                                             null,
                 cond: dailyForecasts[x].condition.id,
                 condIcon: dailyForecasts[x].icon,
-                wind_speed: dailyForecasts[x][units].windSpeed,
+                wind_speed: dailyForecasts[x][wind_units].windSpeed,
                 wind_dir: direction,
                 humid: dailyForecasts[x].humidity,
                 precip: (dailyForecasts[x][units].rain !== null && dailyForecasts[x][units].rain !== undefined) ? dailyForecasts[x][units].rain : 0,

=== modified file 'components/SettingsSheet.qml'
--- components/SettingsSheet.qml	2013-08-05 18:53:33 +0000
+++ components/SettingsSheet.qml	2013-08-30 13:31:38 +0000
@@ -28,12 +28,23 @@
         title: i18n.tr("Settings")
         contentsHeight: parent.height
 
-        container: ListItem.ValueSelector {
-            id: unitsSelector
-            objectName: "UnitsSelector"
-            text: i18n.tr("Units")
-            values: [i18n.tr("Metric"), i18n.tr("Imperial")]
-            selectedIndex: (settings["units"] === "imperial") ? 1 : 0;
+        container: Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            ListItem.ValueSelector {
+                id: unitsSelector
+                objectName: "UnitsSelector"
+                text: i18n.tr("Temperature units")
+                values: [i18n.tr("Celsius"), i18n.tr("Fahrenheit")]
+                selectedIndex: (settings["units"] === "imperial") ? 1 : 0;
+            }
+            ListItem.ValueSelector {
+                id: windUnitsSelector
+                objectName: "WindUnitsSelector"
+                text: i18n.tr("Wind speed units")
+                values: [i18n.tr("Kilometers per hour"), i18n.tr("Miles per hour")]
+                selectedIndex: (settings["wind_units"] === "mph") ? 1 : 0;
+            }
         }
 
         Component.onCompleted: {
@@ -42,12 +53,18 @@
 
         onConfirmClicked: {
             var refresh = false,
-                selectedUnit = (unitsSelector.selectedIndex === 0) ? "metric" : "imperial";
+                selectedUnit = (unitsSelector.selectedIndex === 0) ? "metric" : "imperial",
+                selectedWindUnit = (windUnitsSelector.selectedIndex === 0) ? "kmh" : "mph";
             // check if temperaure scale was changed
             if(settings["units"] !== selectedUnit) {
                 storage.saveSetting("units", selectedUnit);
                 refresh = true;
             }
+            //
+            if(settings["wind_units"] !== selectedWindUnit) {
+                storage.saveSetting("wind_units", selectedWindUnit);
+                refresh = true;
+            }
             // handling of other settings here
             // ....
 

=== modified file 'components/WeatherDetailComponent.qml'
--- components/WeatherDetailComponent.qml	2013-08-22 12:07:35 +0000
+++ components/WeatherDetailComponent.qml	2013-08-30 13:31:38 +0000
@@ -22,7 +22,7 @@
         style: Text.Raised
         font.bold: false
         font.family: "Ubuntu"
-        font.pointSize: FontUtils.sizeToPixels("x-small") //9
+        font.pointSize: FontUtils.sizeToPixels("x-small")
         fontSizeMode: Text.Fit
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
@@ -63,7 +63,7 @@
 
     Text {
         id: value
-        objectName: "CurrentTempText"
+        objectName: "WeatherDetailValue"
         text: infoComponent.value.toPrecision()
         color: Theme.palette.normal.baseText
         style: Text.Raised
@@ -111,7 +111,8 @@
 
     Text {
         id: unit
-        text: infoComponent.unit
+        objectName: "WeatherDetailUnit"
+        text: infoComponent.unit        
         color: Theme.palette.normal.baseText
         style: Text.Raised
         font.bold: false

=== added file 'resources/images/12.png'
Binary files resources/images/12.png	1970-01-01 00:00:00 +0000 and resources/images/12.png	2013-08-30 13:31:38 +0000 differ
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-08-29 19:27:52 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-08-30 13:31:38 +0000
@@ -36,6 +36,7 @@
 
     def _check_units(self, units):
         """Checks selected units by values from the first location tab"""
+        self.assertThat(lambda: self.main_window.get_objects('QQuickText', 'CurrentTempText'), Eventually(Not(Is(None))))
         current_temps = self.main_window.get_objects('QQuickText', 'CurrentTempText')
         if units == "imperial":
             self.assertThat(current_temps[0].text, Eventually(Equals(u'72')))
@@ -44,6 +45,22 @@
             self.assertThat(current_temps[0].text, Eventually(Equals(u'22')))
             self.assertThat(current_temps[1].text, Eventually(Equals(u'24')))
 
+    def _check_wind_units(self, wind_units):
+        """Checks selected units by values from the first location tab"""
+        self.assertThat(lambda: self.main_window.get_objects('WeatherDetailComponent', 'WindSpeedValue')[0], Eventually(Not(Is(None))))
+        wind_component = self.main_window.get_objects('WeatherDetailComponent', 'WindSpeedValue')[0]
+        self.assertThat(lambda: wind_component.get_object('QQuickText', 'WeatherDetailUnit'), Eventually(Not(Is(None))))
+        wind_unit = wind_component.get_object('QQuickText', 'WeatherDetailUnit')
+        self.assertThat(lambda: wind_component.get_object('QQuickText', 'WeatherDetailValue'), Eventually(Not(Is(None))))
+        wind_value = wind_component.get_object('QQuickText', 'WeatherDetailValue')
+        if wind_units == "mph":
+            self.assertThat(wind_unit.text, Eventually(Equals(u'mph NW')))
+            self.assertThat(wind_value.text, Eventually(Equals(u'3')))
+        else:
+            self.assertThat(wind_unit.text, Eventually(Equals(u'km/h NW')))
+            self.assertThat(wind_value.text, Eventually(Equals(u'4')))
+
+
     def test_switch_scale(self):
         """Tests switching the scale in the settings"""
         # first check metric values and open the settings sheet
@@ -58,8 +75,8 @@
 
         # choose second option, fahrenheit
         self._move_pointer_around()
-        self.assertThat(lambda: units_selector.get_children()[2], Eventually(Not(Is(None))))
-        imperial_option = units_selector.get_children()[2]
+        self.assertThat(lambda: units_selector.select_many('LabelVisual')[3], Eventually(Not(Is(None))))
+        imperial_option = units_selector.select_many('LabelVisual')[3]
         self.pointing_device.click_object(imperial_option)
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
         self._click_sheet_confirm()
@@ -79,8 +96,8 @@
 
         # click celsius option
         self._move_pointer_around()
-        self.assertThat(lambda: units_selector.get_children()[3], Eventually(Not(Is(None))))
-        metric_option = units_selector.get_children()[3]
+        self.assertThat(lambda: units_selector.select_many('LabelVisual')[2], Eventually(Not(Is(None))))
+        metric_option = units_selector.select_many('LabelVisual')[2]
         self.pointing_device.click_object(metric_option)
 
         # confirm
@@ -96,8 +113,10 @@
         """Test canceling switching scale"""
         # first check metric values and open the settings sheet
         self._check_units('metric')
+        self._check_wind_units('kmh')
         self._open_settings_sheet()
 
+        # open the temp value selector
         self.assertThat(lambda: self.main_window.get_object('ValueSelector', 'UnitsSelector'), Eventually(Not(Is(None))))
         units_selector = self.main_window.get_object('ValueSelector', "UnitsSelector")
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(0)))
@@ -105,12 +124,74 @@
 
         # choose second option, fahrenheit
         self._move_pointer_around()
-        self.assertThat(lambda: units_selector.get_children()[2], Eventually(Not(Is(None))))
-        imperial_option = units_selector.get_children()[2]
+        self.assertThat(lambda: units_selector.select_many('LabelVisual')[3], Eventually(Not(Is(None))))
+        imperial_option = units_selector.select_many('LabelVisual')[3]
         self.pointing_device.click_object(imperial_option)
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
 
+        # open the wind value selector
+        self.assertThat(lambda: self.main_window.get_object('ValueSelector', 'WindUnitsSelector'), Eventually(Not(Is(None))))
+        units_selector = self.main_window.get_object('ValueSelector', "WindUnitsSelector")
+        self.assertThat(units_selector.selectedIndex, Eventually(Equals(0)))
+        self.pointing_device.click_object(units_selector)
+
+        # choose second option, mph
+        self._move_pointer_around()
+        self.assertThat(lambda: units_selector.select_many('LabelVisual')[3], Eventually(Not(Is(None))))
+        mph_option = units_selector.select_many('LabelVisual')[3]
+        self.pointing_device.click_object(mph_option)
+        self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
+
         # cancel and check
         self._click_sheet_cancel()
         self._check_units('metric')
+        self._check_wind_units('kmh')
+
+    def test_switch_wind_scale(self):
+        """Tests switching the wind scale in the settings"""
+        # first check metric values and open the settings sheet
+        self._check_wind_units('kmh')
+        self._open_settings_sheet()
+
+        # open the wind value selector
+        self.assertThat(lambda: self.main_window.get_object('ValueSelector', 'WindUnitsSelector'), Eventually(Not(Is(None))))
+        units_selector = self.main_window.get_object('ValueSelector', "WindUnitsSelector")
+        self.assertThat(units_selector.selectedIndex, Eventually(Equals(0)))
+        self.pointing_device.click_object(units_selector)
+
+        # choose second option, mph
+        self._move_pointer_around()
+        self.assertThat(lambda: units_selector.select_many('LabelVisual')[3], Eventually(Not(Is(None))))
+        mph_option = units_selector.select_many('LabelVisual')[3]
+        self.pointing_device.click_object(mph_option)
+        self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
+        self._click_sheet_confirm()
+
+        # wait for reload and check the mph values
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self._check_wind_units('mph')
+
+        # switch back to kmh values again
+        self._open_settings_sheet()
+        self.assertThat(lambda: self.main_window.get_object('ValueSelector', 'WindUnitsSelector'), Eventually(Not(Is(None))))
+        units_selector = self.main_window.get_object('ValueSelector', "WindUnitsSelector")
+        self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
+        self.pointing_device.click_object(units_selector)
+        self.assertThat(units_selector.expanded, Eventually(Equals(True)))
+
+        # click celsius option
+        self._move_pointer_around()
+        self.assertThat(lambda: units_selector.select_many('LabelVisual')[2], Eventually(Not(Is(None))))
+        metric_option = units_selector.select_many('LabelVisual')[2]
+        self.pointing_device.click_object(metric_option)
+
+        # confirm
+        self.assertThat(units_selector.selectedIndex, Eventually(Equals(0)))
+        self._click_sheet_confirm()
+
+        # wait for reload and check the metric values again
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self._check_units('metric')
 

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-08-23 19:30:18 +0000
+++ ubuntu-weather-app.qml	2013-08-30 13:31:38 +0000
@@ -43,7 +43,7 @@
     property var locationsList: []
     property var tabsObject: null
     // set default values for settings here
-    property var settings: {"units":"metric"}
+    property var settings: {"units":"metric", "wind_units": "kmh"}
 
     WorkerScript {
         id: locationDataWorker