Merge lp:~ahayzen/ubuntu-weather-app/reboot-settings-page into lp:ubuntu-weather-app

[Andrew Hayzen]

* Basic implementation of settings for Units, DataProvider and RefreshInterval

* Basic implementation of settings for Units, DataProvider and RefreshInterval

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

PASSED: Continuous integration, rev:15
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/17/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/17

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

It doesn't appear as though making changes to the settings is persisting when the user leaves the page and goes back into settings.

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

Fixed, seems the selectedIndex changes *after* the delegate clicked signal, so now using the index from the signal itself.

[lp:~ahayzen/ubuntu-weather-app/reboot-settings-page]

16. By Andrew Hayzen on 2015-02-10

* Merge of upstream

17. By Andrew Hayzen on 2015-02-10

* Fix for options not being saved

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

PASSED: Continuous integration, rev:17
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/20/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/20

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I'm trying to debug now, but for some reason when I switch to metric for temperature units, the "tempMax" from the API does not show up in the HeadTempInfo.qml section. I don't see any errors in the console output.

The rest looks great though!

review: Needs Information

[lp:~ahayzen/ubuntu-weather-app/reboot-settings-page]

18. By Andrew Hayzen on 2015-02-11

* Fix for maxTemps <0 not appearing

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

PASSED: Continuous integration, rev:18
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/21/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/21

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

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-settings-page]

19. By Andrew Hayzen on 2015-02-11

* Further fix for when tempMax is 0

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

PASSED: Continuous integration, rev:19
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/22/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/22

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This looks good to me. My above comment was reported as lp:1420609 and the fix for that has been introduced into this MP.

review: Approve

[Victor Thompson (vthompson)]

I'm going to top approve this, but we'll want to get some finalized visual's for the Settings page's sub-views. So far as I can tell, we don't have a spec for them.

=== modified file 'app/components/HeaderRow.qml'
--- app/components/HeaderRow.qml	2015-02-03 21:26:09 +0000
+++ app/components/HeaderRow.qml	2015-02-11 04:29:37 +0000
@@ -42,6 +42,8 @@
         height: width
         width: units.gu(4)
 
+        onClicked: mainPageStack.push(Qt.resolvedUrl("../ui/SettingsPage.qml"))
+
         Rectangle {
             anchors {
                 fill: parent

=== modified file 'app/data/WeatherApi.js'
--- app/data/WeatherApi.js	2015-01-27 18:51:25 +0000
+++ app/data/WeatherApi.js	2015-02-11 04:29:37 +0000
@@ -480,7 +480,7 @@
             },
             imperial: {
                 tempMin: calcFahrenheit(data.minTemp),
-                tempMax: calcFahrenheit(data.maxTemp || data.minTemp),
+                tempMax: calcFahrenheit(data.maxTemp !== undefined ? data.maxTemp : data.minTemp),
                 windSpeed: convertKmhToMph(partData.wSpeed)
             },
             precipType: partData.precip_type,
@@ -728,7 +728,7 @@
                         api_key: message.params.api_key
                     },
                     secsFromLastFetch = (now-loc.updated)/1000;
-                if( message.params.force===true || loc.format !== RESPONSE_DATA_VERSION || secsFromLastFetch > 1800){
+                if( message.params.force===true || loc.format !== RESPONSE_DATA_VERSION || secsFromLastFetch > params.interval){
                     // data older than 30min, location is new or data format is deprecated
                     WeatherApi.getLocationData(params, updatedHnd, onError);
                 } else {

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-02-11 04:29:37 +0000
+++ app/ubuntu-weather-app.qml	2015-02-11 04:29:37 +0000
@@ -101,7 +101,8 @@
                         locations:locations,
                         force:force_refresh,
                         service:settings.service,
-                        api_key: Key.twcKey
+                        api_key: Key.twcKey,
+                        interval: settings.refreshInterval
                     }
                 }, responseDataHandler)
             });
@@ -112,6 +113,7 @@
         id: settings
         category: "weatherSettings"
 
+        property int refreshInterval: 1800
         property string precipUnits
         property string service
         property string tempScale

=== modified file 'app/ui/CMakeLists.txt'
--- app/ui/CMakeLists.txt	2015-02-03 21:26:09 +0000
+++ app/ui/CMakeLists.txt	2015-02-11 04:29:37 +0000
@@ -1,3 +1,5 @@
+add_subdirectory(Settings)
+
 file(GLOB UI_QML_JS_FILES *.qml *.js)
 
 add_custom_target(ubuntu-weather-app_ui_QMlFiles ALL SOURCES ${UI_QML_JS_FILES})

=== modified file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml	2015-02-11 04:29:37 +0000
+++ app/ui/HomePage.qml	2015-02-11 04:29:37 +0000
@@ -35,7 +35,7 @@
     /*
       Data properties
     */
-    property string name;
+    property string name
     property string conditionText
     property string currentTemp
     property string todayMaxTemp
@@ -79,7 +79,7 @@
         // set current temps and condition
         iconName = (current.icon) ? current.icon : ""
         conditionText = (current.condition.main) ? current.condition.main : current.condition; // difference TWC/OWM
-        todayMaxTemp = (today[tempUnits].tempMax) ? Math.round(today[tempUnits].tempMax).toString() + settings.tempScale: "";
+        todayMaxTemp = (today[tempUnits].tempMax !== undefined) ? Math.round(today[tempUnits].tempMax).toString() + settings.tempScale: "";
         todayMinTemp = Math.round(today[tempUnits].tempMin).toString() + settings.tempScale;
         currentTemp = Math.round(current[tempUnits].temp).toString() + String("°");
 

=== added directory 'app/ui/Settings'
=== added file 'app/ui/Settings/CMakeLists.txt'
--- app/ui/Settings/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/ui/Settings/CMakeLists.txt	2015-02-11 04:29:37 +0000
@@ -0,0 +1,5 @@
+file(GLOB UI_SETTINGS_QML_JS_FILES *.qml *.js)
+
+add_custom_target(ubuntu-weather-app_ui_settings_QMlFiles ALL SOURCES ${UI_SETTINGS_QML_JS_FILES})
+
+install(FILES ${UI_SETTINGS_QML_JS_FILES} DESTINATION ${UBUNTU-WEATHER_APP_DIR}/ui/settings)

=== added file 'app/ui/Settings/DataProviderPage.qml'
--- app/ui/Settings/DataProviderPage.qml	1970-01-01 00:00:00 +0000
+++ app/ui/Settings/DataProviderPage.qml	2015-02-11 04:29:37 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+
+Page {
+    title: i18n.tr("Data Provider")
+
+    Flickable {
+        anchors {
+            fill: parent
+        }
+        height: parent.height
+        contentHeight: unitsColumn.childrenRect.height
+
+        Column {
+            id: unitsColumn
+            anchors {
+                fill: parent
+            }
+
+            ListItem.ItemSelector {
+                expanded: true
+                model: ["openweathermap", "weatherchannel"]  // "geonames", "geoip"]
+                selectedIndex: model.indexOf(settings.service)
+                text: i18n.tr("Provider")
+
+                onDelegateClicked: {
+                    settings.service = model[index]
+                    refreshData(false, true)
+                }
+            }
+        }
+    }
+}

=== added file 'app/ui/Settings/RefreshIntervalPage.qml'
--- app/ui/Settings/RefreshIntervalPage.qml	1970-01-01 00:00:00 +0000
+++ app/ui/Settings/RefreshIntervalPage.qml	2015-02-11 04:29:37 +0000
@@ -0,0 +1,56 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+
+Page {
+    title: i18n.tr("Refresh Interval")
+
+    Flickable {
+        anchors {
+            fill: parent
+        }
+        height: parent.height
+        contentHeight: unitsColumn.childrenRect.height
+
+        Column {
+            id: unitsColumn
+            anchors {
+                fill: parent
+            }
+
+            ListItem.ItemSelector {
+                delegate: OptionSelectorDelegate {
+                    text: Math.floor(modelData / 60).toString() + " " + i18n.tr("minutes")
+                }
+                expanded: true
+                model: [300, 600, 900, 1800]
+                selectedIndex: model.indexOf(settings.refreshInterval)
+                text: i18n.tr("Interval")
+
+                onDelegateClicked: {
+                    settings.refreshInterval = model[index]
+                    refreshData(false, true)
+                }
+            }
+        }
+    }
+}

=== added file 'app/ui/Settings/UnitsPage.qml'
--- app/ui/Settings/UnitsPage.qml	1970-01-01 00:00:00 +0000
+++ app/ui/Settings/UnitsPage.qml	2015-02-11 04:29:37 +0000
@@ -0,0 +1,77 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+
+Page {
+    title: i18n.tr("Units")
+
+    Flickable {
+        anchors {
+            fill: parent
+        }
+        height: parent.height
+        contentHeight: unitsColumn.childrenRect.height
+
+        Column {
+            id: unitsColumn
+            anchors {
+                fill: parent
+            }
+
+            ListItem.ItemSelector {
+                expanded: true
+                model: ["°C", "°F"]
+                selectedIndex: model.indexOf(settings.tempScale)
+                text: i18n.tr("Temperature")
+
+                onDelegateClicked: {
+                    settings.tempScale = model[index]
+                    refreshData()
+                }
+            }
+
+            ListItem.ItemSelector {
+                expanded: true
+                model: ["mm", "in"]
+                selectedIndex: model.indexOf(settings.precipUnits)
+                text: i18n.tr("Precipitation")
+
+                onDelegateClicked: {
+                    settings.precipUnits = model[index]
+                    refreshData()
+                }
+            }
+
+            ListItem.ItemSelector {
+                expanded: true
+                model: ["kmh", "mph"]
+                text: i18n.tr("Wind Speed")
+                selectedIndex: model.indexOf(settings.windUnits)
+
+                onDelegateClicked: {
+                    settings.windUnits = model[index]
+                    refreshData()
+                }
+            }
+        }
+    }
+}

=== added file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	1970-01-01 00:00:00 +0000
+++ app/ui/SettingsPage.qml	2015-02-11 04:29:37 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+
+Page {
+    title: i18n.tr("Settings")
+
+    Flickable {
+        anchors {
+            fill: parent
+        }
+        height: parent.height
+        contentHeight: settingsColumn.childrenRect.height
+
+        Column {
+            id: settingsColumn
+            anchors {
+                fill: parent
+            }
+
+            ListItem.SingleValue {
+                progression: true
+                text: i18n.tr("Units")
+
+                onClicked: mainPageStack.push(Qt.resolvedUrl("Settings/UnitsPage.qml"))
+            }
+
+            ListItem.SingleValue {
+                progression: true
+                text: i18n.tr("Data Provider")
+
+                onClicked: mainPageStack.push(Qt.resolvedUrl("Settings/DataProviderPage.qml"))
+            }
+
+            ListItem.SingleValue {
+                progression: true
+                text: i18n.tr("Refresh Interval")
+
+                onClicked: mainPageStack.push(Qt.resolvedUrl("Settings/RefreshIntervalPage.qml"))
+            }
+        }
+    }
+}

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-02-11 04:29:37 +0000
+++ po/com.ubuntu.weather.pot	2015-02-11 04:29:37 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-09 19:09+0000\n"
+"POT-Creation-Date: 2015-02-11 04:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -25,6 +25,46 @@
 msgid "Locations"
 msgstr ""
 
+#: ../app/ui/Settings/DataProviderPage.qml:25 ../app/ui/SettingsPage.qml:49
+msgid "Data Provider"
+msgstr ""
+
+#: ../app/ui/Settings/DataProviderPage.qml:44
+msgid "Provider"
+msgstr ""
+
+#: ../app/ui/Settings/RefreshIntervalPage.qml:25 ../app/ui/SettingsPage.qml:56
+msgid "Refresh Interval"
+msgstr ""
+
+#: ../app/ui/Settings/RefreshIntervalPage.qml:42
+msgid "minutes"
+msgstr ""
+
+#: ../app/ui/Settings/RefreshIntervalPage.qml:47
+msgid "Interval"
+msgstr ""
+
+#: ../app/ui/Settings/UnitsPage.qml:25 ../app/ui/SettingsPage.qml:42
+msgid "Units"
+msgstr ""
+
+#: ../app/ui/Settings/UnitsPage.qml:44
+msgid "Temperature"
+msgstr ""
+
+#: ../app/ui/Settings/UnitsPage.qml:56
+msgid "Precipitation"
+msgstr ""
+
+#: ../app/ui/Settings/UnitsPage.qml:67
+msgid "Wind Speed"
+msgstr ""
+
+#: ../app/ui/SettingsPage.qml:25
+msgid "Settings"
+msgstr ""
+
 #: ubuntu-weather-app.desktop.in.in.h:1
 msgid "Weather"
 msgstr ""