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

[Martin Borho]

Possibility added for storing settings into and loading settings from storage.

Possibility added for storing settings into and loading settings from storage.

Also a property named "settings" was added to mainView, for default values and to access the settings within the app. "imperial" has to be the "units"-value for using Fahrenheit. API calls will take the "units" setting into account.

For now the values will be saved in a new LocalStorage table. This is temporary solution until an upstream component is ready.

At startup all settings will be loaded from storage.

//To save a setting:
storage.saveSetting("units", "imperial")

The corresponding property in mainView.settings has to be updated too after changes!

@Raúl does it fit into your work?

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

PASSED: Continuous integration, rev:32
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/16/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/13
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/16

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

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

It fits perfectly! Great work, Martin!

review: Approve

=== modified file 'components/AddLocationDialog.qml'
--- components/AddLocationDialog.qml	2013-06-04 21:36:23 +0000
+++ components/AddLocationDialog.qml	2013-06-09 16:50:35 +0000
@@ -52,7 +52,7 @@
                     citiesModel.clear();
                     searchWorker.sendMessage({
                         action: "searchByName",
-                        params: {name:locationString.text, units:"metric"}
+                        params: {name:locationString.text, units:mainView.settings["units"]}
                     })
                 }
             }
@@ -65,7 +65,7 @@
                 citiesModel.clear();
                 searchWorker.sendMessage({
                     action: "searchByPoint",
-                    params: {coords: {"lon":10,"lat":53.549999}, units:"metric"}
+                    params: {coords: {"lon":10,"lat":53.549999}, units:mainView.settings["units"]}
                 })
             }
         }
 
=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-04-21 18:05:01 +0000
+++ components/CurrentWeather.qml	2013-06-09 16:50:35 +0000
@@ -11,8 +11,7 @@
     property int currentTemp
     property int minTemp
     property int maxTemp
-    property bool metric: true
-    property string scale: (metric) ? "C" : "F"
+    property string scale: (mainView.settings["units"] === "imperial") ? "F" : "C"
 
     width: parent.width
     height: childrenRect.height+units.gu(10)
 
=== modified file 'components/DayWeatherComponent.qml'
--- components/DayWeatherComponent.qml	2013-04-21 18:05:01 +0000
+++ components/DayWeatherComponent.qml	2013-06-09 16:50:35 +0000
@@ -13,8 +13,7 @@
     property string icon
     property int temperature
     property int temperatureMin
-    property bool metric: true
-    property string scale: (metric) ? "C" : "F"
+    property string scale: (mainView.settings["units"] === "imperial") ? "F" : "C"
     property string shapeColor: "#D6D6D6"
 
      UbuntuShape{
 
=== modified file 'components/Storage.qml'
--- components/Storage.qml	2013-06-04 21:36:23 +0000
+++ components/Storage.qml	2013-06-09 16:50:35 +0000
@@ -15,7 +15,46 @@
                     tx.executeSql('CREATE TABLE IF NOT EXISTS Locations(id INTEGER PRIMARY KEY AUTOINCREMENT, data TEXT, date TEXT)');
                     console.log('Database created');
                 });
-        }
+            // reopen database with new version number
+            db = LocalStorage.openDatabaseSync("ubuntu-weather-app", "", "Default Ubuntu weather app", 100000);
+        }
+
+        if(db.version === "0.1") {
+            db.changeVersion("0.1", "0.2",
+                function(tx) {
+                    tx.executeSql('CREATE TABLE IF NOT EXISTS settings(key TEXT UNIQUE, value TEXT)');
+                    console.log('Settings table added, Database upgraded to v0.2');
+                });
+        }
+    }
+
+    function saveSetting(key, value) {
+        openDB();
+        db.transaction( function(tx){
+            tx.executeSql('INSERT OR REPLACE INTO settings VALUES(?, ?)', [key, value]);
+        });
+    }
+
+    function getSettings(callback) {
+        openDB();
+        var settings = {};
+        db.readTransaction(
+            function(tx){
+                var rs = tx.executeSql('SELECT key, value FROM Settings');
+                for(var i = 0; i < rs.rows.length; i++) {
+                    var row = rs.rows.item(i);
+                    settings[row.key] = row.value;
+                }
+                callback(settings);
+            }
+        );
+    }
+
+    function clearSetting(name) {
+        openDB();
+        db.transaction(function(tx){
+            tx.executeSql('DELETE FROM Settings WHERE key = ?', [name]);
+        });
     }
 
     function insertLocation(data) {
@@ -36,9 +75,8 @@
     }
 
     function getLocations(callback) {
-
         openDB();
-        db.transaction(
+        db.readTransaction(
             function(tx){
                 var locations = [];
                 var rs = tx.executeSql('SELECT * FROM Locations');
@@ -64,6 +102,7 @@
         openDB();
         db.transaction(function(tx){
             tx.executeSql('DELETE FROM Locations WHERE 1');
+            tx.executeSql('DELETE FROM Settings WHERE 1');
         });
     }
 }
 
=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2013-05-01 14:45:17 +0000
+++ components/WeatherApi.js	2013-06-09 16:50:35 +0000
@@ -301,10 +301,12 @@
                                 finished(result);
                             }
                         },
+                        units = (message.params.units === "metric" || message.params.units === "imperial")
+                                                                            ? message.params.units : "metric",
                         params = {
                             location:loc.location,
                             db: loc.db,
-                            units: message.params.units
+                            units: units
                         };
                     WeatherApi.getLocationData(params, updatedHnd, onError);
                 })
 
=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-06-04 21:36:23 +0000
+++ ubuntu-weather-app.qml	2013-06-09 16:50:35 +0000
@@ -15,6 +15,8 @@
 
     property var locationsList: []
     property var tabsObject: null
+    // set default values for settings here
+    property var settings: {"units":"metric"}
 
     WorkerScript {
         id: locationDataWorker
@@ -71,7 +73,7 @@
     function locationAdded(locationObj) {
         locationDataWorker.sendMessage({
             action: "newLocationData",
-            params: {location:locationObj, units:"metric"}
+            params: {location:locationObj, units:settings["units"]}
         });
     }
 
@@ -84,14 +86,21 @@
         storage.getLocations(function(locations) {
             locationDataWorker.sendMessage({
                 action: "updateData",
-                params: {locations:locations, units:"metric"}
+                params: {locations:locations, units:settings["units"]}
             })
         });
     }
 
     Component.onCompleted: {
         //storage.clearDB();
-        refreshData();
+        //storage.clearSetting('units');
+        //storage.saveSetting("units", "imperial")
+        storage.getSettings(function(storedSettings) {
+            for(var settingName in storedSettings) {
+                settings[settingName] = storedSettings[settingName];
+            }
+            refreshData();
+        })
     }
 
     Components.AddLocationDialog {