Merge lp:~neokore/ubuntu-weather-app/ChooseAddLocationComponent into lp:ubuntu-weather-app/obsolete.trunk

[Raúl Yeguas]

First version for location manager.

First version for location manager.

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

FAILED: Continuous integration, rev:7
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/1/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/1/console
    FAILURE: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/1/console

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Hi Raúl,

Thanks a lot for your branch. I've noticed the diff contains unresolved merge conflicts that need to be resolved before the merge proposal can be accepted (see the ubuntu-weather-app.qml file).

Do you think you could fix them and commit the changes to your branch? This way the merge proposal will be updated with your fixes.

Thanks!

review: Needs Fixing

[lp:~neokore/ubuntu-weather-app/ChooseAddLocationComponent]

8. By Raúl Yeguas on 2013-04-19

Resolved conflicts for merging.

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

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

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Looks good!

@Raúl: Do you have already started with the API integration? I would like to do that tommorrow, plus the storage part, if it's ok?

review: Approve

=== added file 'components/AddLocationDialog.qml'
--- components/AddLocationDialog.qml	1970-01-01 00:00:00 +0000
+++ components/AddLocationDialog.qml	2013-04-19 19:18:34 +0000
@@ -0,0 +1,115 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+// Dialog for adding a new location
+Component {
+    id: addLocationDialog
+    Dialog {
+        id: addLocationDialogue
+        property string cityCode: ''
+        height: units.gu(10)
+        title: i18n.tr("Add location")
+        text: i18n.tr("Write a city name o pick it by GPS location")
+
+        onCityCodeChanged: {
+            PopupUtils.close(addLocationDialogue);
+            addLocationAction.cityCode = cityCode;
+        }
+
+        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: {
+                    // Load cities from API search
+                    var cities = [{"id":"100000","name":"Madrid"}, {"id":"200000","name":"Seville"}, {"id":"300000","name":"Barcelona"}, {"id":"400000","name":"Valencia"},{"id":"500000","name":"Jaen"}];
+                    createCityList(cities);
+                }
+            }
+        }
+
+        Button {
+            id: locationGPSButton
+            text: i18n.tr("Get by GPS location")
+            onClicked: {
+                // Load cities from API search
+                var cities = [{"id":"100000","name":"Madrid"}, {"id":"200000","name":"Seville"}, {"id":"300000","name":"Barcelona"}, {"id":"400000","name":"Valencia"},{"id":"500000","name":"Jaen"}];
+                createCityList(cities);
+            }
+        }
+
+        Button {
+            id: locationCancelButton
+            text: i18n.tr("Cancel")
+            color: "#C00000"
+            onClicked: PopupUtils.close(addLocationDialogue)
+        }
+
+        // This rectangle is a workaround to keep enough height in the dialog
+        Rectangle {
+            width: units.gu(30)
+            height: units.gu(20)
+            color: "transparent"
+        }
+
+        Item {
+            id: locationResultBox
+            anchors {
+                top: locationCancelButton.bottom
+                topMargin: units.gu(2)
+            }
+        }
+
+        // Function to show a list of cities in addCityAction
+        function createCityList(cities) {
+            if(resultList){
+                resultList.destroy();
+            }
+
+            var list = 'import QtQuick 2.0; \
+                import Ubuntu.Components 0.1; \
+                import Ubuntu.Components.ListItems 0.1 as ListItem; \
+                Rectangle { \
+                    id: cityList; \
+                    width: units.gu(30); \
+                    height: units.gu(20); \
+                    color: "transparent"; \
+                    ListView { \
+                        id: listView; \
+                        clip: true; \
+                        anchors.fill: parent; \
+                        model: ListModel { \
+            ';
+            for (var i in cities) {
+                list += 'ListElement { \
+                    label:\''+cities[i]["name"]+'\'; \
+                    code:\''+cities[i]["id"]+'\'; \
+                }';
+            };
+            list += ' \
+                        } \
+                        delegate: ListItem.Standard { \
+                            text: i18n.tr(label); \
+                            progression: true; \
+                            onClicked: { addLocationDialogue.cityCode = code;} \
+                        } \
+                    } \
+                    Scrollbar { \
+                        flickableItem: listView; \
+                        align: Qt.AlignTrailing; \
+                    } \
+                } \
+            ';
+            resultList = Qt.createQmlObject(list,locationResultBox,'results');
+        }
+    }
+}

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-03-09 15:34:59 +0000
+++ components/CurrentWeather.qml	2013-04-19 19:18:34 +0000
@@ -10,24 +10,13 @@
     property int currentTemp
     property int minTemp
     property int maxTemp
-    property bool metric
+    property bool metric: true
+    property string scale: (metric) ? "C" : "F"
 
     width: parent.width
     height: childrenRect.height+units.gu(10)
     anchors.horizontalCenter: parent.horizontalCenter
 
-    Component.onCompleted: {
-        if(currentWeather.metric){
-            tempCurrent.text = tempCurrent.text + ("C");
-            tempMin.text = tempMin.text + ("C");
-            tempMax.text = tempMax.text + ("C");
-        }else{
-            tempCurrent.text = tempCurrent.text + ("F");
-            tempMax.text = tempMax.text + ("F");
-            tempMin.text = tempMin.text + ("F");
-        }
-    }
-
     Image {
         id: image1
         width: units.gu(30)
@@ -65,7 +54,7 @@
 
             Label {
                 id: tempMax
-                text: maxTemp+"°"
+                text: maxTemp+"°"+currentWeather.scale
                 anchors.horizontalCenter: parent.horizontalCenter
                 font.pixelSize: FontUtils.sizeToPixels("medium")
                 horizontalAlignment: Text.AlignHCenter
@@ -76,7 +65,7 @@
             width: units.gu(17)
             height: units.gu(10)
             id: tempCurrent
-            text: currentTemp+String("°")
+            text: currentTemp+String("°")+currentWeather.scale
             style: Text.Normal
             font.bold: false
             font.family: "Ubuntu"
@@ -104,7 +93,7 @@
 
             Label {
                 id: tempMin
-                text: minTemp+"°"
+                text: minTemp+"°"+currentWeather.scale
                 horizontalAlignment: Text.AlignHCenter
                 anchors.horizontalCenter: parent.horizontalCenter
                 font.pixelSize: FontUtils.sizeToPixels("medium")

=== added file 'resources/images/[e-mail]'
Binary files resources/images/[e-mail]	1970-01-01 00:00:00 +0000 and resources/images/[e-mail]	2013-04-19 19:18:34 +0000 differ
=== added file 'resources/images/[e-mail]'
Binary files resources/images/[e-mail]	1970-01-01 00:00:00 +0000 and resources/images/[e-mail]	2013-04-19 19:18:34 +0000 differ
=== added file 'resources/images/[e-mail]'
Binary files resources/images/[e-mail]	1970-01-01 00:00:00 +0000 and resources/images/[e-mail]	2013-04-19 19:18:34 +0000 differ
=== renamed file 'ubuntu-weather-app.qml' => 'weather.qml'
--- ubuntu-weather-app.qml	2013-04-11 20:37:30 +0000
+++ weather.qml	2013-04-19 19:18:34 +0000
@@ -1,21 +1,22 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
 import "components" as Components
 import "components/WeatherApi.js" as Api
 
-/*!
-    \brief MainView with Tabs element.
-           First Tab has a single Label and
-           second Tab has a single ToolbarAction.
-*/
-
 MainView {
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "weather"
-    applicationName: "ubuntu-weather-app"
+    id: mainView
     
     width: units.gu(50)
     height: units.gu(75)
+
+    property var resultList: null
+
+    Components.AddLocationDialog {
+        id: addLocationDialog
+    }
     
     Components.Storage{
         id: storage
@@ -25,14 +26,49 @@
         id: tabs
         anchors.fill: parent
         
-        // First tab begins here
+        // Location 1
         Tab {
-            objectName: "Tab1"
-            
-            title: i18n.tr("Weather")
-            
-            // Tab content begins here
+            id: location1
+            objectName: "City1"
+            
+            title: i18n.tr("London")
+            
+            // Menu for options
             page: Page {
+
+                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, location1);
+                        }
+
+                        onCityCodeChanged: {
+                            // Action for adding a new cityCode
+                            console.log('DEBUG: cityCode has changed to '+cityCode);
+                        }
+                    }
+
+                    Action {
+                        id: removeLocationAction
+                        property string cityCode: ''
+                        objectName: "action"
+
+                        iconSource: Qt.resolvedUrl("resources/images/remove_icon.png")
+                        text: i18n.tr("Remove")
+
+                        onTriggered: {
+                            // Action for removing a weather location
+                        }
+                    }
+                }
+
                 Rectangle {
                     id: startPage
                     width: parent.width
@@ -89,37 +125,65 @@
                 }
             }
         }
-        
-        // Second tab begins here
+
+        // Location 2
         Tab {
-            objectName: "Tab2"
-            
-            title: i18n.tr("Optional Screen")
+            objectName: "City2"
+
+            title: i18n.tr("San Francisco")
+
             page: Page {
-                anchors.margins: units.gu(2)
-                
-                tools: ToolbarActions {
-                    Action {
-                        objectName: "action"
-                        
-                        iconSource: Qt.resolvedUrl("avatar.png")
-                        text: i18n.tr("Tap me!")
-                        
-                        onTriggered: {
-                            label.text = i18n.tr("Toolbar tapped")
+
+                Rectangle {
+                    id: cityForecast2
+                    width: parent.width
+                    height: parent.height
+                    Flickable {
+                        width: parent.width
+                        height: parent.height
+                        contentHeight: column1.height
+                        Column {
+                            width: parent.width
+                            Components.DateComponent {
+                                dateRelative: "Today"
+                                dateString:"Saturday, 9th February"
+                                borderTopVisible: false
+                            }
+                            Components.CurrentWeather {
+                                condition: 801
+                                currentTemp: 11
+                                minTemp: 8
+                                maxTemp: 17
+                                metric: true
+                            }
+                            Components.DateComponent {
+                                dateRelative: "Tomorrow"
+                                dateString:"Sunday, 10th February"
+                            }
+                            Components.DayWeatherComponent {
+                                temperature: 18
+                                temperatureMin: 10
+                                condition: 801
+                            }
+                            Components.DateComponent {
+                                dateString:"Monday, 11th February"
+                            }
+                            Components.DayWeatherComponent {
+                                temperature: 20
+                                temperatureMin: 10
+                                condition: 801
+                            }
+                            Components.DateComponent {
+                                dateString:"Tuesday, 12th February"
+                            }
+                            Components.DayWeatherComponent {
+                                temperature: 20
+                                temperatureMin: 11
+                                condition: 801
+                            }
                         }
                     }
                 }
-                
-                Column {
-                    anchors.centerIn: parent
-                    Label {
-                        id: label
-                        objectName: "label"
-                        
-                        text: i18n.tr("Swipe from bottom to up to reveal the toolbar.")
-                    }
-                }
             }
         }
     }