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

[Martin Borho]

Location manager added

* Added location manager for adding and removing location. Bug #1187314
* "Remove" action removed from toolbar, Bug #1187315
* at first start or when no locations are defined the location manager is shown.
* LocationTabEmpty.qml was removed
* PageStack component added to the app.
* LocationManagerPage added
* AddLocationDialog became AddLocationPage
* dummy item added in LocationManager for "Current location" like in http://design.canonical.com/2013/03/app-patterns-applied-weather-key-journeys/. London is used as dummy location unitl location lookup is provided from QT/device
* disabled api requests for hourly forcasts until data will be used in the UI
* locations can be removed by sliding them from the locations list in location manager

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

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

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

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

Great work again, Martin!

review: Approve

=== renamed file 'components/AddLocationDialog.qml' => 'components/AddLocationPage.qml'
--- components/AddLocationDialog.qml	2013-06-09 15:42:41 +0000
+++ components/AddLocationPage.qml	2013-06-12 17:57:26 +0000
@@ -1,113 +1,79 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem;
-
-// Dialog for adding a new location
-Component {
-    id: addLocationDialog
-
-    Dialog {        
-        id: addLocationDialogue
-        height: units.gu(10)
-        title: i18n.tr("Add location")
-        text: i18n.tr("Write a city name or pick it by your location")
-
-        WorkerScript {
-            id: searchWorker
-            source: "./WeatherApi.js"
-            onMessage: {
-                if(!messageObject.error) {
-
-                    messageObject.result.locations.forEach(function(loc) {
-                        citiesModel.append(loc);
-                    });
-                } else {
-                    console.log(messageObject.error.msg+" / "+messageObject.error.request.url)
-                }
-            }
-        }
-
-        function locationSelected(index) {
-            var location = citiesModel.get(index);
-            // make clone
-            location = JSON.parse(JSON.stringify(location));
-            mainView.locationAdded(location);
-            PopupUtils.close(addLocationDialogue)
-        }
-
-        Row {
-            TextField {
-                id: locationString
-                width: units.gu(25)
-                placeholderText: i18n.tr("Enter a city name")
-            }
-            Button {
-                id: locationSearchButton
-
-                width: units.gu(5)
-                iconSource: "../resources/images/search_icon.png"
-
-                onClicked: {
-                    citiesModel.clear();
-                    searchWorker.sendMessage({
-                        action: "searchByName",
-                        params: {name:locationString.text, units:mainView.settings["units"]}
-                    })
-                }
-            }
-        }
-
-        Button {
-            id: locationGPSButton
-            text: i18n.tr("Use my own location")
-            onClicked: {
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Page {
+    id: addLocationPage
+    objectName: "AddLocationrPage"
+    title: i18n.tr("Add city")
+    visible: false
+    tools.locked: true
+    tools.opened: true
+
+    WorkerScript {
+        id: searchWorker
+        source: "./WeatherApi.js"
+        onMessage: {
+            if(!messageObject.error) {
+                messageObject.result.locations.forEach(function(loc) {
+                    citiesModel.append(loc);
+                });
+            } else {
+                console.log(messageObject.error.msg+" / "+messageObject.error.request.url)
+            }
+        }
+    }
+
+    function clear() {
+        locationString.text = ''
+        citiesModel.clear()
+    }
+
+    Rectangle {
+        id: searchInput
+        width:parent.width
+        height:units.gu(7)
+        color: "transparent"
+        TextField {
+            id: locationString
+            width: parent.width-units.gu(2)
+            height:units.gu(5)
+            anchors.centerIn: parent
+            placeholderText: i18n.tr("Enter a city name")
+            hasClearButton: true
+            onAccepted: {
                 citiesModel.clear();
                 searchWorker.sendMessage({
-                    action: "searchByPoint",
-                    params: {coords: {"lon":10,"lat":53.549999}, units:mainView.settings["units"]}
+                    action: "searchByName",
+                    params: {name:locationString.text, units:"metric"}
                 })
             }
         }
-
-        Button {
-            id:locationCancelButton
-            text: i18n.tr("Cancel")
-            color: "#C00000"
-            onClicked: PopupUtils.close(addLocationDialogue)
-        }
-
-        Item {
-            id: locationResultBox
-            anchors {
-                top: locationCancelButton.bottom
-                topMargin: units.gu(2)
-            }
-        }
-
-        ListModel {
-            id: citiesModel
-        }
-
-        Rectangle {
-            id: cityList;
-            width: units.gu(30);
-            height: units.gu(30);
-            color: "transparent";
-            ListView {
-                id: listView;
-                clip: true;
-                anchors.fill: parent;
-                model:  citiesModel;
-                delegate: ListItem.Standard {
-                    text: i18n.tr(name)+((country) ? ', '+i18n.tr(country): '');
-                    progression: true;
-                    onClicked: {
-                        var tabsString = "import QtQuick 2.0; import Ubuntu.Components 0.1; import Ubuntu.Components.Popups 0.1;"
-                                   + "Tabs {id: tabs; anchors.fill: parent; Tab { title: 'Loading...';  LoadingComponent{id:bigLoading; anchors.fill: parent; z: 2;}}}"
-                        tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs")
-                        locationSelected(index);
-                    }
+    }
+
+    ListModel {
+        id: citiesModel
+    }
+
+    Rectangle {
+        id: cityList;
+        anchors.top: searchInput.bottom
+        width: parent.width
+        height: units.gu(52)
+        color: "transparent"
+        ListView {
+            id: listView;
+            clip: true;
+            anchors.fill: parent;
+            model:  citiesModel;
+            delegate: ListItem.Standard {
+                text: i18n.tr(name)+((country) ? ', '+i18n.tr(country): '');
+                progression: true;
+                onClicked: {
+                    var location = citiesModel.get(index)
+                    locationManager.addLocation(location)
+                    pageStack.pop()
+                    clear()
                 }
             }
             Scrollbar {
@@ -116,4 +82,5 @@
             }
         }
     }
+
 }

=== added file 'components/LocationManagerPage.qml'
--- components/LocationManagerPage.qml	1970-01-01 00:00:00 +0000
+++ components/LocationManagerPage.qml	2013-06-12 17:57:26 +0000
@@ -0,0 +1,174 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+
+Page {
+    id: locationManagerPage
+    objectName: "LocationManagerPage"
+    title: i18n.tr("Edit locations")
+    visible: false
+
+    property bool locationsChanged: false
+
+    tools: ToolbarActions {
+        locked: true
+        opened: (locationModel.count > 0) ? true : false
+        back.onTriggered: {
+            if(locationsChanged) {
+                mainView.refreshData()
+                locationsChanged = false;
+            }
+            // handle dummy "current location" item
+            currentLocationItem.visible = false
+            locationLookupItem.visible = true
+            lookupItemAddButton.visible = true
+        }
+    }
+
+    function loadData() {
+        storage.getLocations(fillLocationsList);
+    }
+
+    function checkLocationExists(location) {
+        for(var x=0;x<locationModel.count;x++) {
+            var loc = locationModel.get(x);
+            if(loc.service === location.service
+                    && loc.service_id === location.service_id) {
+                existsNotification.show()
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function fillLocationsList(locations) {
+        locationModel.clear()
+        for(var x=0;x<locations.length;x++) {
+            var dbId = locations[x].db.id,
+                location = locations[x].location;
+            // add db-id to the location object
+            location.dbId = dbId;
+            locationModel.append(locations[x].location);
+        }
+    }
+
+    function addLocation(location) {
+        if(!checkLocationExists(location)) {
+            storage.insertLocation({location:location});
+            loadData()
+            locationsChanged = true;
+        }
+    }
+
+
+    Dialog {
+        id:existsNotification
+        title: i18n.tr("Location already added.")
+        Button {
+            text: i18n.tr("OK")
+            onClicked: PopupUtils.close(existsNotification)
+        }
+    }
+
+    ListModel {
+        id: locationModel
+    }
+
+    Column {
+        anchors.fill: parent
+        Rectangle {
+            color: "#D6D6D6"
+            width:parent.width
+            height: units.gu(0.3)
+        }
+        Rectangle {
+            width: parent.width
+            height: units.gu(5)
+            Label {
+                anchors.verticalCenter: parent.verticalCenter
+                text: " "+i18n.tr("Current location")
+                fontSize: "large"
+            }
+        }
+        Rectangle {
+            color: "#D6D6D6"
+            width:parent.width
+            height: units.gu(0.3)
+        }
+        ListItem.Standard {
+            id: locationLookupItem
+            text: i18n.tr("Lookup location")+" (Dummy)"
+            progression: true
+            onClicked: {
+                print("TODO: lookup current location")
+                visible = false
+                currentLocationItem.visible = true;
+            }
+        }
+        ListItem.Standard {
+            id: currentLocationItem
+            visible: false
+            text: i18n.tr("London")
+            //icon:  Qt.resolvedUrl("../resources/images/refresh_icon.png")
+            control: Button {
+                id: lookupItemAddButton
+                anchors.verticalCenter: parent.verticalCenter
+                text: i18n.tr("add")
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        // add dummy location
+                        addLocation({"service_id":2643743,"name":"London","country":"GB","service":"openweathermap"})
+                        lookupItemAddButton.visible = false;
+                    }
+                }
+            }
+        }
+        Rectangle {
+            id:test2
+            width: parent.width
+            height: units.gu(5)
+            Label {
+                anchors.verticalCenter: parent.verticalCenter
+                text: " "+i18n.tr("World")
+                fontSize: "large"
+            }
+        }
+        Rectangle {
+            color: "#D6D6D6"
+            width:parent.width
+            height: units.gu(0.3)
+        }
+        Rectangle {
+            width: parent.width
+            clip:true
+            color:"transparent"
+            height: units.gu(40)
+            ListView {
+                objectName: "locationList"
+                anchors.fill: parent
+                model: locationModel
+                delegate: ListItem.Standard {
+                    text: model.name
+                    removable: true
+                    onItemRemoved: {
+                        var location = locationModel.get(index)
+                        locationsChanged = true;
+                        storage.clearLocation(location.dbId);
+                        locationModel.remove(index)
+                    }
+                    backgroundIndicator: Rectangle {
+                        anchors.fill: parent
+                        color: "gray"
+                    }
+                }
+                footer: ListItem.Standard {
+                    text: i18n.tr("Add city")
+                    progression: true
+                    onClicked: pageStack.push(addLocationPage)
+                }
+            }
+        }
+    }
+}

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-06-12 17:08:05 +0000
+++ components/LocationTab.qml	2013-06-12 17:57:26 +0000
@@ -56,44 +56,23 @@
 
         tools: ToolbarActions {
             Action {
-                id: addLocationAction
-                property string cityCode: ''
-                objectName: "action"
-
-                iconSource: Qt.resolvedUrl("../resources/images/add_icon.png")
-                text: i18n.tr("Add")
-
-                onTriggered: {
-                    PopupUtils.open(addLocationDialog, locationTab);
-                }
-            }
-
-            Action {
-                id: removeLocationAction
-                property string cityCode: ''
-                objectName: "action"
-
-                iconSource: Qt.resolvedUrl("../resources/images/remove_icon.png")
-                text: i18n.tr("Remove")
-
-                onTriggered: {
-                    mainView.removeLocation(locationData.db.id)
-                }
-            }
-
-            Action {
                 id: refreshAction
                 iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
                 text: i18n.tr("Refresh")
 
                 onTriggered: {
-                    var tabsString = "import QtQuick 2.0; import Ubuntu.Components 0.1; import Ubuntu.Components.Popups 0.1;"
-                               + "Tabs {id: tabs; anchors.fill: parent; Tab { title: 'Loading...';  LoadingComponent{id:bigLoading; anchors.fill: parent; z: 2;}}}"
-                    tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs")
                     mainView.refreshData();
                 }
             }
+            Action {
+                id: editLocationAction
+                iconSource: Qt.resolvedUrl("../resources/images/add_icon.png")
+                text: i18n.tr("Edit")
 
+                onTriggered: {
+                    mainView.showLocationManager()
+                }
+            }
             Action {
                 id: configAction
                 iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")

=== removed file 'components/LocationTabEmpty.qml'
--- components/LocationTabEmpty.qml	2013-04-20 16:17:57 +0000
+++ components/LocationTabEmpty.qml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components 0.1
-
-Tab {
-    id: locationTabEmpty
-
-    title: i18n.tr("No Locations")
-
-    // Menu for options
-    page: Page {
-        anchors.fill: parent
-        tools: ToolbarActions {
-            Action {
-                id: addLocationAction
-                property string cityCode: ''
-                objectName: "action"
-
-                iconSource: Qt.resolvedUrl("../resources/images/add_icon.png")
-                text: i18n.tr("Add")
-
-                onTriggered: {
-                    PopupUtils.open(addLocationDialog, locationTabEmpty);
-                }
-            }
-        }
-
-        Label {
-            anchors.centerIn: parent;
-            text: "Add one";
-        }
-
-    }
-
-}

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2013-06-09 15:42:41 +0000
+++ components/WeatherApi.js	2013-06-12 17:57:26 +0000
@@ -233,7 +233,7 @@
             addDataToResponse = (function(data) {
                 response[data.request.type] = data;
                 if(response["current"] !== undefined
-                        && response["forecast"] !== undefined
+                        //&& response["forecast"] !== undefined
                             && response["daily"] !== undefined) {
                     onSuccess(response);
                 }
@@ -248,7 +248,7 @@
             })
 
             this.getCurrentCondition(params, addDataToResponse, retryHandler);
-            this.getForecast(params, addDataToResponse, retryHandler);
+            //this.getForecast(params, addDataToResponse, retryHandler);
             this.getDailyForecast(params, addDataToResponse, retryHandler);
         }
     }
@@ -285,8 +285,6 @@
             WeatherApi.search("name", message.params, finished, onError);
         } else if(message.action === "searchByPoint") {
             WeatherApi.search("point", message.params, finished, onError);
-        } else if(message.action === "newLocationData") {
-            WeatherApi.getLocationData(message.params, finished, onError);
         } else if(message.action === "updateData") {
             var locLength = message.params.locations.length,
                 locUpdated = 0,

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-06-12 17:08:05 +0000
+++ ubuntu-weather-app.qml	2013-06-12 17:57:26 +0000
@@ -28,8 +28,6 @@
                         storage.updateLocation(loc.db.id, loc);
                     });
                     buildTabs(messageObject.result);
-                } else if(messageObject.action === "newLocationData") {
-                    onNewLocationDataSuccess(messageObject.result);
                 }
             } else {
                 console.log(messageObject.error.msg+" / "+messageObject.error.request.url)
@@ -43,6 +41,12 @@
         var locLength = locations.length,
             locBeforeLen = locationsList.length,
             focusToLast = (locBeforeLen > 0 && locLength > locBeforeLen) ? true : false;
+        // show locationmanager when no location is added
+        if(locLength === 0) {
+            showLocationManager()
+            return;
+        }
+
         locationsList = locations;
         if(tabsObject !== null) {
             tabsObject.destroy()
@@ -53,8 +57,6 @@
             for(var x=0;x<locLength;x++) {
                 tabsString += "Components.LocationTab {title: '"+locations[x].location.name+"'; locationIndex: "+x+"} "
             };
-        } else {
-            tabsString += "Components.LocationTabEmpty { }"
         }
         tabsString += "}"; // END Tabs componen
         if(bigLoading !== null)
@@ -65,24 +67,9 @@
             tabsObject.selectedTabIndex = locLength -1;
     }
 
-    function removeLocation(dbId) {
-        storage.clearLocation(dbId);
-        storage.getLocations(buildTabs);
-    }
-
-    function locationAdded(locationObj) {
-        locationDataWorker.sendMessage({
-            action: "newLocationData",
-            params: {location:locationObj, units:settings["units"]}
-        });
-    }
-
-    function onNewLocationDataSuccess(resp) {
-        var res = storage.insertLocation(resp);
-        storage.getLocations(buildTabs);
-    }
-
     function refreshData() {
+        if(bigLoading === null)
+             loading.running = true;
         storage.getLocations(function(locations) {
             locationDataWorker.sendMessage({
                 action: "updateData",
@@ -91,6 +78,11 @@
         });
     }
 
+    function showLocationManager() {
+        pageStack.push(locationManager)
+        locationManager.loadData()
+    }
+
     Component.onCompleted: {
         //storage.clearDB();
         //storage.clearSetting('units');
@@ -103,7 +95,7 @@
         })
     }
 
-    Components.AddLocationDialog {
+    Components.AddLocationPage {
         id: addLocationDialog
     }
 
@@ -115,17 +107,31 @@
         id: storage
     }
 
-    Page {
-        id: tabPage
-        title: "Simple page"
-        ActivityIndicator{id:loading; running: false; z: 1; anchors{top: parent.top; topMargin: units.gu(0.5); right: parent.right; rightMargin: units.gu(1)}}
-        Tabs {
-            id: tabs
-            objectName: "Tabs"
-            anchors.fill: parent
-            Tab {
-                title: "Loading..."
-                Components.LoadingComponent{id:bigLoading; anchors.fill: parent; z: 2;}
+    Components.LocationManagerPage {
+        id:locationManager
+    }
+
+    Components.AddLocationPage {
+        id:addLocationPage
+    }
+
+    PageStack {
+        id: pageStack
+        Component.onCompleted: push(tabPage)
+
+        Page {
+            id: tabPage
+            title: "Simple page"
+            visible: false
+            ActivityIndicator{id:loading; running: false; z: 1; anchors{top: parent.top; topMargin: units.gu(0.5); right: parent.right; rightMargin: units.gu(1)}}
+            Tabs {
+                id: tabs
+                objectName: "Tabs"
+                anchors.fill: parent
+                Tab {
+                    title: "Loading..."
+                    Components.LoadingComponent{id:bigLoading; anchors.fill: parent; z: 2;}
+                }
             }
         }
     }