Merge lp:~dpm/ubuntu-weather-app/fix-nexus7 into lp:ubuntu-weather-app/obsolete.trunk

[David Planella]

Removes SideStage hint, fixes related to the sizes of the current weather data display on tablets

This branch includes 3 fixes:

- Raúl Yeguas' work to resize the UbuntuShapes on the current weather view to fit on a Nexus 7
- Removal of the sidestage hint on the desktop file so that Weather loads in tablet mode on the N7 and N10
- Enables a semi-tablet mode for N7, where the current weather boxes work in phone mode

This can be tested directly from this click package: http://people.canonical.com/~dpm/click/com.ubuntu.weather_1.0.201_all.click

On a Nexus 10:
http://ubuntuone.com/46IatexM4cnTub78iHfDAn

On a Nexus 7:
http://ubuntuone.com/5cqF5SY2qEPgVV32JUJLh5

Known issues:
- Current weather boxes not vertically centered on the N7
- Weather data provider toolbar is a bit off on the N7
- Sometimes the H temperature is not shown (see N10 screenshot above)
- Discovered a crash [1] on the N7. It might need a wipe of the DB to reproduce it

[1] http://paste.ubuntu.com/6962965/

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

PASSED: Continuous integration, rev:201
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/145/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/31
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/143
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/143
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/57

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Great work!

review: Approve

[Martin Borho (martin-borho)]

 \o/

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-18 21:26:36 +0000
+++ CMakeLists.txt	2014-02-19 23:50:23 +0000
@@ -12,7 +12,7 @@
 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
 set(APP_HARDCODE ubuntu-weather-app)
 set(MAIN_QML ubuntu-weather-app.qml)
-set(ICON [e-mail])
+set(ICON_FILE [e-mail])
 set(AUTOPILOT_DIR ubuntu_weather_app)
 
 if(CLICK_MODE)
@@ -23,13 +23,14 @@
     set(CMAKE_INSTALL_PREFIX /)
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
+    set(ICON ${ICON_FILE})
     set(EXEC "qmlscene ${MAIN_QML}")
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
 else(CLICK_MODE)
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
     set(EXEC ${APP_HARDCODE})
-    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
+    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
     configure_file(${APP_HARDCODE}.in
         ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
@@ -48,7 +49,7 @@
      *.qml *.js *.png *.js)
 install(DIRECTORY components resources DESTINATION ${DATA_DIR})
 install(FILES key.js DESTINATION ${DATA_DIR})
-install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
+install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
 
 configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
 file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})

=== modified file 'com.ubuntu.weather_weather.desktop.in.in'
--- com.ubuntu.weather_weather.desktop.in.in	2014-02-14 09:04:01 +0000
+++ com.ubuntu.weather_weather.desktop.in.in	2014-02-19 23:50:23 +0000
@@ -6,5 +6,4 @@
 Icon=@ICON@
 Name=tr("Weather")
 X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
 X-Ubuntu-Gettext-Domain=@PROJECT_NAME@

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2014-02-18 17:55:17 +0000
+++ components/CurrentWeather.qml	2014-02-19 23:50:23 +0000
@@ -43,6 +43,13 @@
     property string tempScale: (mainView.settings["units"] === "imperial") ? "F" : "C"
     property string speedScale: (mainView.settings["wind_units"] === "mph") ? "mph" : "km/h"
     property string precipScale: (mainView.settings["precip_units"] === "in") ? "in" : "mm"
+    // Note that this should actually be a phone width, but since
+    // the tablet layout is not yet working well on a N7, we
+    // set the width to trigger this layout to be higher than that
+    // of a N7, so that on that device it will still be in phone
+    // mode
+    // Nexus 7's width is 1920px/21px/GU = 91.43 GU
+    property real wideModeThreshold: units.gu(95)
 
     property NumberAnimation appearAnimation: frontrect.conditionIcon.appearAnimation
 
@@ -85,13 +92,13 @@
         layouts: [
             ConditionalLayout {
                 name: "WeatherItem"
-                when: layouts.width > units.gu(80)
+                when: layouts.width > wideModeThreshold
                 Rectangle {
                     color: "transparent"
                     anchors.fill: parent
                     CurrentWeatherFront {
                          id: frontrect
-                         shapeSize: units.gu(18)
+                         viewMode: 1
                          anchors {
                              horizontalCenter: parent.horizontalCenter
                              verticalCenter: parent.verticalCenter
@@ -104,9 +111,9 @@
                          shapeSize: units.gu(14)
                          gridColumns: 4
                          anchors {
+                             top: frontrect.bottom
+                             topMargin: units.gu(7)
                              horizontalCenter: parent.horizontalCenter
-                             verticalCenter: parent.verticalCenter
-                             verticalCenterOffset: (parent.height*0.2);
                          }
                      }                     
                      Components.ScrollingArea {}
@@ -133,16 +140,17 @@
                 id: frontrect
                 anchors.fill: parent
                 Layouts.item: "front"
+                viewMode: 0
             }
 
             states:[
                 State {
                     name: "back"
-                    when: flipable.flipped && layouts.width < units.gu(80)
+                    when: flipable.flipped && layouts.width < wideModeThreshold
                 },
                 State {
                     name: "front"
-                    when: !flipable.flipped && layouts.width < units.gu(80)
+                    when: !flipable.flipped && layouts.width < wideModeThreshold
                 }
             ]
 

=== modified file 'components/CurrentWeatherFront.qml'
--- components/CurrentWeatherFront.qml	2014-02-15 16:04:16 +0000
+++ components/CurrentWeatherFront.qml	2014-02-19 23:50:23 +0000
@@ -29,7 +29,8 @@
     property alias conditionIcon: currentConditionIcon
     property alias conditionTempContent: currentConditionTempContent
     property alias conditionTemp: currentConditionTemp
-    property int shapeSize: units.gu(15)
+    property int shapeSize: (viewMode == 0) ? units.gu(15) : units.gu(28)
+    property int viewMode // 0: Mobile, 1: Tablet
 
     UbuntuShape {
         id: currentCondition
@@ -49,6 +50,7 @@
             anchors.centerIn: parent
             anchors.margins: units.gu(1)
             condition: currentWeather.icon
+            viewMode: frontrect.viewMode
         }
     }
 
@@ -71,6 +73,8 @@
             minTemp: Math.round(currentWeather.minTemp)
             maxTemp: Math.round(currentWeather.maxTemp)
             anchors.fill: parent
+
+            viewMode: frontrect.viewMode
         }
     }
 }

=== modified file 'components/WeatherConditionIconComponent.qml'
--- components/WeatherConditionIconComponent.qml	2014-01-28 10:04:42 +0000
+++ components/WeatherConditionIconComponent.qml	2014-02-19 23:50:23 +0000
@@ -15,6 +15,8 @@
     property int totalImage: 50
     property NumberAnimation appearAnimation : appear
 
+    property int viewMode // 0: mobile, 1: tablet
+
     /* temporary icon map */
     property var conditionicon: {
         "clear_day": "02",
@@ -45,8 +47,8 @@
         id: icon
         anchors.centerIn: parent
         source: "../resources/images/"+conditionicon[condition]+"/"+currentImage+".png"
-        height: units.gu(18)
-        width: units.gu(18)
+        height: (viewMode == 0) ? units.gu(18) : units.gu(30)
+        width: (viewMode == 0) ? units.gu(18) : units.gu(30)
     }
 
     NumberAnimation {

=== modified file 'components/WeatherTemperatureComponent.qml'
--- components/WeatherTemperatureComponent.qml	2014-01-22 22:02:58 +0000
+++ components/WeatherTemperatureComponent.qml	2014-02-19 23:50:23 +0000
@@ -18,6 +18,7 @@
 import QtQuick 2.0
 import QtGraphicalEffects 1.0
 import Ubuntu.Components 0.1
+import Ubuntu.Layouts 0.1
 
 Rectangle {
     id: tempComponent
@@ -28,112 +29,242 @@
     property int maxTemp
     property int minTemp
 
-    Text {
-        id: value
-        objectName: "CurrentTempText"
-        text: tempComponent.currentTemp
-        color: Theme.palette.normal.baseText
-        style: Text.Raised
-        font.bold: false
-        font.family: "Ubuntu"
-        font.pointSize: units.gu(9) //FontUtils.sizeToPixels("xx-large")
-        font.letterSpacing: -2
-        fontSizeMode: Text.Fit
-        verticalAlignment: Text.AlignTop
-        horizontalAlignment: Text.AlignRight
-        height: units.gu(9)
-        width: units.gu(9)
-        anchors {
-            top: parent.top
-            topMargin: units.gu(1)
-            left: parent.left
-            leftMargin: units.gu(1)
-        }
-    }
-    Text {
-        id: currentTempScale
-        objectName: "CurrentTempScale"
-        text: String("°") + tempComponent.tempScale
-        style: Text.Raised
-        font.bold: false
-        font.family: "Ubuntu"
-        font.pointSize: FontUtils.sizeToPixels("medium")
-        verticalAlignment: Text.AlignTop
-        horizontalAlignment: Text.AlignLeft
-        color: Theme.palette.normal.baseText
-        height: units.gu(9)
-        anchors {
-            top: value.top
-            topMargin: units.gu(0.5)
-            left: value.right
-        }
-    }
-
-    Rectangle {
-        id: line2
-        color: "#55000000"
-        anchors {
-            top: value.bottom
-            left: parent.left
-            leftMargin: units.gu(2)
-            right: parent.right
-            rightMargin: units.gu(2)
-        }
-        height: 1
-        width: units.gu(10)
-
-    }
-    Rectangle {
-        color: "#55FFFFFF"
-        anchors {
-            top: line2.bottom
-            bottomMargin: 1
-            left: line2.left
-            right: line2.right
-        }
-        height: 1
-        width: units.gu(10)
-
-    }
-
-
-    Text {
-        id: max
-        // TRANSLATORS: this refers to the High (max) temperature forecasted for a day
-        text: i18n.tr("H:") + " " + tempComponent.maxTemp
-        color: Theme.palette.normal.baseText
-        style: Text.Raised
-        font.bold: false
-        font.family: "Ubuntu"
-        font.pointSize: FontUtils.sizeToPixels("small")
-        verticalAlignment: Text.AlignVCenter
-        horizontalAlignment: Text.AlignHCenter
-        visible:(dailyForecastList.currentIndex === 0 && tempComponent.maxTemp)
-        anchors {
-            bottom: parent.bottom
-            bottomMargin: units.gu(2)
-            left: parent.left
-            leftMargin: units.gu(2)
-        }
-    }
-
-    Text {
-        id: min
-        // TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
-        text: i18n.tr("L:") + " " + tempComponent.minTemp
-        color: Theme.palette.normal.baseText
-        style: Text.Raised
-        font.bold: false
-        font.family: "Ubuntu"
-        font.pointSize: FontUtils.sizeToPixels("small")
-        fontSizeMode: Text.Fit
-        verticalAlignment: Text.AlignVCenter
-        horizontalAlignment: Text.AlignHCenter
-        anchors {
-            bottom: parent.bottom
-            bottomMargin: units.gu(2)
-            right: parent.right
-            rightMargin: units.gu(2)
+    property int viewMode // 0: Mobile, 1: Tablet
+
+    Layouts {
+        objectName: "WeatherTemperatureLayout"
+        id: layoutsCurrentTemp
+
+        anchors.fill: parent
+
+        /*layouts: [
+            ConditionalLayout {
+                name: "WeatherTempItem"
+                when: layouts.width > units.gu(80)
+
+                Text {
+                    id: valueBig
+                    objectName: "CurrentTempText"
+                    text: tempComponent.currentTemp
+                    color: Theme.palette.normal.baseText
+                    style: Text.Raised
+                    font.bold: false
+                    font.family: "Ubuntu"
+                    font.pointSize: units.gu(14)
+                    font.letterSpacing: -2
+                    fontSizeMode: Text.Fit
+                    verticalAlignment: Text.AlignTop
+                    horizontalAlignment: Text.AlignRight
+                    height: units.gu(14)
+                    width: units.gu(14)
+                    anchors {
+                        top: parent.top
+                        topMargin: units.gu(1)
+                        left: parent.left
+                        leftMargin: units.gu(1)
+                    }
+                }
+
+                Text {
+                    id: currentTempScaleBig
+                    objectName: "CurrentTempScale"
+                    text: String("°") + tempComponent.tempScale
+                    style: Text.Raised
+                    font.bold: false
+                    font.family: "Ubuntu"
+                    font.pointSize: FontUtils.sizeToPixels("x-large");
+                    verticalAlignment: Text.AlignTop
+                    horizontalAlignment: Text.AlignLeft
+                    color: Theme.palette.normal.baseText
+                    height: units.gu(9)
+                    anchors {
+                        top: value.top
+                        topMargin: units.gu(0.5)
+                        left: value.right
+                    }
+                }
+
+                Rectangle {
+                    id: line2Big
+                    color: "#55000000"
+                    anchors {
+                        bottom: maxBig.top
+                        bottomMargin: units.gu(1)
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        right: parent.right
+                        rightMargin: units.gu(2)
+                    }
+                    height: 1
+                    width: units.gu(10)
+
+                }
+                Rectangle {
+                    color: "#55FFFFFF"
+                    anchors {
+                        top: line2Big.bottom
+                        bottomMargin: 1
+                        left: line2Big.left
+                        right: line2Big.right
+                    }
+                    height: 1
+                    width: units.gu(10)
+
+                }
+
+
+                Text {
+                    id: maxBig
+                    // TRANSLATORS: this refers to the High (max) temperature forecasted for a day
+                    text: i18n.tr("H:") + " " + tempComponent.maxTemp
+                    color: Theme.palette.normal.baseText
+                    style: Text.Raised
+                    font.bold: false
+                    font.family: "Ubuntu"
+                    font.pointSize: FontUtils.sizeToPixels("large");
+                    verticalAlignment: Text.AlignVCenter
+                    horizontalAlignment: Text.AlignHCenter
+                    visible:(dailyForecastList.currentIndex === 0 && tempComponent.maxTemp)
+                    anchors {
+                        bottom: parent.bottom
+                        bottomMargin: units.gu(2)
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                    }
+                }
+
+                Text {
+                    id: minBig
+                    // TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
+                    text: i18n.tr("L:") + " " + tempComponent.minTemp
+                    color: Theme.palette.normal.baseText
+                    style: Text.Raised
+                    font.bold: false
+                    font.family: "Ubuntu"
+                    font.pointSize: FontUtils.sizeToPixels("large");
+                    fontSizeMode: Text.Fit
+                    verticalAlignment: Text.AlignVCenter
+                    horizontalAlignment: Text.AlignHCenter
+                    anchors {
+                        bottom: parent.bottom
+                        bottomMargin: units.gu(2)
+                        right: parent.right
+                        rightMargin: units.gu(2)
+                    }
+                }
+            }
+
+        ]*/
+
+
+        Text {
+            id: value
+            objectName: "CurrentTempText"
+            text: tempComponent.currentTemp
+            color: Theme.palette.normal.baseText
+            style: Text.Raised
+            font.bold: false
+            font.family: "Ubuntu"
+            font.pointSize: (viewMode == 0) ? units.gu(9) : units.gu(18) //FontUtils.sizeToPixels("xx-large")
+            font.letterSpacing: -2
+            fontSizeMode: Text.Fit
+            verticalAlignment: Text.AlignTop
+            horizontalAlignment: Text.AlignRight
+            height: (viewMode == 0) ? units.gu(9) : units.gu(18)
+            width: (viewMode == 0) ? units.gu(9) : units.gu(18)
+            anchors {
+                top: parent.top
+                topMargin: units.gu(1)
+                left: parent.left
+                leftMargin: units.gu(1)
+            }
+        }
+        Text {
+            id: currentTempScale
+            objectName: "CurrentTempScale"
+            text: String("°") + tempComponent.tempScale
+            style: Text.Raised
+            font.bold: false
+            font.family: "Ubuntu"
+            font.pointSize: (viewMode == 0) ? FontUtils.sizeToPixels("medium") : FontUtils.sizeToPixels("x-large")
+            verticalAlignment: Text.AlignTop
+            horizontalAlignment: Text.AlignLeft
+            color: Theme.palette.normal.baseText
+            height: units.gu(9)
+            anchors {
+                top: value.top
+                topMargin: units.gu(0.5)
+                left: value.right
+            }
+        }
+
+        Rectangle {
+            id: line2
+            color: "#55000000"
+            anchors {
+                bottom: max.top
+                bottomMargin: (viewMode == 0) ? 0 : units.gu(1)
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            height: 1
+            width: units.gu(10)
+
+        }
+        Rectangle {
+            color: "#55FFFFFF"
+            anchors {
+                top: line2.bottom
+                bottomMargin: 1
+                left: line2.left
+                right: line2.right
+            }
+            height: 1
+            width: units.gu(10)
+
+        }
+
+
+        Text {
+            id: max
+            // TRANSLATORS: this refers to the High (max) temperature forecasted for a day
+            text: i18n.tr("H:") + " " + tempComponent.maxTemp
+            color: Theme.palette.normal.baseText
+            style: Text.Raised
+            font.bold: false
+            font.family: "Ubuntu"
+            font.pointSize: (viewMode == 0) ? FontUtils.sizeToPixels("small") : FontUtils.sizeToPixels("large")
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            visible:(dailyForecastList.currentIndex === 0 && tempComponent.maxTemp)
+            anchors {
+                bottom: parent.bottom
+                bottomMargin: units.gu(2)
+                left: parent.left
+                leftMargin: units.gu(2)
+            }
+        }
+
+        Text {
+            id: min
+            // TRANSLATORS: this refers to the Low (min) temperature forecasted for a day
+            text: i18n.tr("L:") + " " + tempComponent.minTemp
+            color: Theme.palette.normal.baseText
+            style: Text.Raised
+            font.bold: false
+            font.family: "Ubuntu"
+            font.pointSize: (viewMode == 0) ? FontUtils.sizeToPixels("small") : FontUtils.sizeToPixels("large")
+            fontSizeMode: Text.Fit
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            anchors {
+                bottom: parent.bottom
+                bottomMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
         }
     }
 }