Merge lp:~ahayzen/ubuntu-weather-app/fix-1583169-add-updated-at-text into lp:ubuntu-weather-app

[Andrew Hayzen]

* Add support for showing updated X minutes ago

* Add support for showing updated X minutes ago

[Andrew Hayzen (ahayzen)]

We are going to get design to review this first.

review: Needs Information

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:250
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/72/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/970/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/72/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/fix-1583169-add-updated-at-text]

251. By Andrew Hayzen on 2017-04-12

* Pull of trunk

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:251
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/75/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/1042/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/75/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Testing:
- Open the weather for a location
- Wait for a long period of time check that the "updated recently" changes to "updated N minutes ago"
- Refresh (pull from top) the location to refresh
- It should now change back to "updated recently"

review: Abstain

[lp:~ahayzen/ubuntu-weather-app/fix-1583169-add-updated-at-text]

252. By Andrew Hayzen on 2017-04-12

* Update changelog date/times

253. By Andrew Hayzen on 2017-04-12

* Add space

[Michael Sheldon (michael-sheldon)]

Looks good!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:253
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/76/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/1043/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/76/rebuild

review: Approve (continuous-integration)

=== modified file 'app/components/HomeTempInfo.qml'
--- app/components/HomeTempInfo.qml	2015-11-02 21:28:34 +0000
+++ app/components/HomeTempInfo.qml	2017-04-12 10:28:17 +0000
@@ -89,6 +89,11 @@
 
     property alias now: nowLabel.text
 
+    // Don't store as int as reaches max int
+    property var updatedAt
+
+    onUpdatedAtChanged: diffTimer.restart()
+
     Column {
         id: labelColumn
         anchors {
@@ -100,7 +105,35 @@
         Label {
             font.weight: Font.Light
             fontSize: "small"
-            text: i18n.tr("Today")
+            text: i18n.tr("Today") + " - " + updatedAtText + " "
+
+            readonly property string updatedAtText: {
+                if (diffDays > 0) {
+                    i18n.tr("updated %1 day ago", "updated %1 days ago", diffDays).arg(diffDays)
+                } else if (diffHours > 0) {
+                    i18n.tr("updated %1 hour ago", "updated %1 hours ago", diffHours).arg(diffHours)
+                } else if (diffMinutes > 0) {
+                    i18n.tr("updated %1 minute ago", "updated %1 minutes ago", diffMinutes).arg(diffMinutes)
+                } else {
+                    i18n.tr("updated recently")
+                }
+            }
+
+            property var diff
+            property int diffMinutes: Math.floor(diff / 60)
+            property int diffHours: Math.floor(diffMinutes / 60)
+            property int diffDays: Math.floor(diffHours / 24)
+
+            // Check the time every 15 seconds
+            Timer {
+                id: diffTimer
+                interval: 15000
+                repeat: true
+                running: parent.visible
+                triggeredOnStart: true
+
+                onTriggered: parent.diff = ((new Date().getTime() - updatedAt) / 1000)
+            }
         }
 
         Label {
 
=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml	2016-08-25 07:47:46 +0000
+++ app/ui/LocationPane.qml	2017-04-12 10:28:17 +0000
@@ -45,6 +45,8 @@
     property var todayData
     property bool graphicVisible : false
 
+    property var lastFetch  // don't store as int as reaches max int
+
     delegate: DayDelegate {
         day: model.day
         high: model.high
@@ -99,6 +101,7 @@
             id: homeTempInfo
             modelData: todayData
             now: mainPageWeekdayListView.currentTemp
+            updatedAt: mainPageWeekdayListView.lastFetch
         }
 
         // TODO: Migrate this to using the new SDK list item when possible.
@@ -231,6 +234,9 @@
             hourlyForecastsData = hourlyForecasts;
             hourlyTempUnits = tempUnits;
         }
+
+        // Set last updated time
+        mainPageWeekdayListView.lastFetch = data.updated;
     }
 
     Component.onCompleted: renderData(index)
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-08-25 07:47:46 +0000
+++ debian/changelog	2017-04-12 10:28:17 +0000
@@ -1,4 +1,12 @@
-ubuntu-weather-app (3.4ubuntu1) UNRELEASED; urgency=medium
+ubuntu-weather-app (3.5ubuntu1) UNRELEASED; urgency=medium
+
+  [ Andrew Hayzen ]
+  * Release 3.4 and bump version to 3.5
+  * Add support for showing updated X minutes ago (LP: #1583169)
+
+ -- Andrew Hayzen <[e-mail]>  Wed, 17 Aug 2016 21:10:10 +0100
+
+ubuntu-weather-app (3.4ubuntu1) xenial; urgency=medium
 
   [ Andrew Hayzen ]
   * Set useragent in geocode so that osm can uniquely identify our requests
 
=== modified file 'manifest.json.in'
--- manifest.json.in	2016-08-25 07:47:46 +0000
+++ manifest.json.in	2017-04-12 10:28:17 +0000
@@ -13,7 +13,7 @@
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "@PROJECT_NAME@",
     "title": "Weather",
-    "version": "3.4.@BZR_REVNO@",
+    "version": "3.5.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"
 
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2016-10-08 08:44:17 +0000
+++ po/com.ubuntu.weather.pot	2017-04-12 10:28:17 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the ubuntu-weather-app package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-08 01:18-0700\n"
+"POT-Creation-Date: 2017-04-12 10:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -58,10 +58,35 @@
 msgid "Manually add a location by swiping up from the bottom of the display"
 msgstr ""
 
-#: ../app/components/HomeTempInfo.qml:103
+#: ../app/components/HomeTempInfo.qml:108
 msgid "Today"
 msgstr ""
 
+#: ../app/components/HomeTempInfo.qml:112
+#, qt-format
+msgid "updated %1 day ago"
+msgid_plural "updated %1 days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/components/HomeTempInfo.qml:114
+#, qt-format
+msgid "updated %1 hour ago"
+msgid_plural "updated %1 hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/components/HomeTempInfo.qml:116
+#, qt-format
+msgid "updated %1 minute ago"
+msgid_plural "updated %1 minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/components/HomeTempInfo.qml:118
+msgid "updated recently"
+msgstr ""
+
 #: ../app/components/ListItemActions/Remove.qml:26
 msgid "Remove"
 msgstr ""