Merge lp:~nik90/ubuntu-clock-app/improve-world-clock-startup into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Improved the loading (startup) time of the Add World City page by delaying the loading of the xmltimezone model and loading the jsontimezone model only when being in search mode.

Improved the loading (startup) time of the Add World City page by delaying the loading of the xmltimezone model and loading the jsontimezone model only when being in search mode.

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

PASSED: Continuous integration, rev:144
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/554/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/893
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/893/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/improve-world-clock-startup]

145. By Nekhelesh Ramananthan on 2014-10-11

Added comments

146. By Nekhelesh Ramananthan on 2014-10-11

reverted pot file change to minimize code diff for review purposes

147. By Nekhelesh Ramananthan on 2014-10-11

Improved if logic

148. By Nekhelesh Ramananthan on 2014-10-11

Updated debian changelog

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

PASSED: Continuous integration, rev:146
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/555/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/894
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/894/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:148
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/556/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/895
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/895/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Tested on PC. Both code and implementation looks good to me

review: Approve

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2014-10-10 10:55:27 +0000
+++ app/worldclock/WorldCityList.qml	2014-10-11 18:41:23 +0000
@@ -37,6 +37,16 @@
     objectName: "worldCityList"
 
     property bool isOnlineMode: false
+    property alias jsonTimeZoneModel: jsonTimeZoneModelLoader.item
+    property alias xmlTimeZoneModel: xmlTimeZoneModelLoader.item
+
+    Component.onCompleted: {
+        /*
+         Load the XML Model *only* after the page has loaded to improve
+         the loading time preception of the user.
+       */
+        xmlTimeZoneModelLoader.sourceComponent = xmlTimeZoneModelComponent
+    }
 
     title: i18n.tr("Select a city")
     visible: false
@@ -54,6 +64,7 @@
                     text: i18n.tr("City")
                     onTriggered: {
                         worldCityList.state = "search"
+                        jsonTimeZoneModelLoader.sourceComponent = jsonTimeZoneModelComponent
                         searchField.forceActiveFocus()
                     }
                 }
@@ -71,6 +82,7 @@
                     searchField.text = ""
                     worldCityList.state = "default"
                     isOnlineMode = false
+                    jsonTimeZoneModelLoader.sourceComponent = undefined
                 }
             }
 
@@ -106,7 +118,9 @@
                             .arg(searchField.text)
                             .arg("&app=com.ubuntu.clock&version=3.2.x")
                             console.log("Online URL: " + url)
-                            jsonTimeZoneModel.source = Qt.resolvedUrl(url)
+                            if (jsonTimeZoneModelLoader.status === Loader.Ready) {
+                                jsonTimeZoneModel.source = Qt.resolvedUrl(url)
+                            }
                         }
                     }
                 }
@@ -130,20 +144,52 @@
         }
     }
 
-    JsonTimeZoneModel {
-        id: jsonTimeZoneModel
-        updateInterval: 60000
-    }
-
-    XmlTimeZoneModel {
-        id: xmlTimeZoneModel
-        updateInterval: 60000
-        source: Qt.resolvedUrl("world-city-list.xml")
+    /*
+     Loader to allow for dynamic loading/unloading of the json model only when
+     necessary.
+    */
+    Loader {
+        id: jsonTimeZoneModelLoader
+        asynchronous: true
+    }
+
+    Component {
+        id: jsonTimeZoneModelComponent
+        JsonTimeZoneModel {
+            updateInterval: 60000
+        }
+    }
+
+    Loader {
+        id: xmlTimeZoneModelLoader
+        asynchronous: true
+    }
+
+    Component {
+        id: xmlTimeZoneModelComponent
+        XmlTimeZoneModel {
+            updateInterval: 60000
+            source: Qt.resolvedUrl("world-city-list.xml")
+        }
     }
 
     SortFilterModel {
         id: sortedTimeZoneModel
-        model: isOnlineMode ? jsonTimeZoneModel : xmlTimeZoneModel
+
+        model: {
+            if (isOnlineMode && jsonTimeZoneModelLoader.status === Loader.Ready) {
+                return jsonTimeZoneModel
+            }
+
+            else  if (xmlTimeZoneModelLoader.status === Loader.Ready) {
+                return xmlTimeZoneModel
+            }
+
+            else {
+                return undefined
+            }
+        }
+
         sort.property: "city"
         sort.order: Qt.AscendingOrder
         filter.property: "city"
@@ -195,8 +241,13 @@
     }
 
     ActivityIndicator {
-        running: jsonTimeZoneModel.status === JsonTimeZoneModel.Loading
-                 && isOnlineMode
+        running: {
+            if (jsonTimeZoneModelLoader.status === Loader.Ready && isOnlineMode) {
+                return jsonTimeZoneModel.status === JsonTimeZoneModel.Loading
+            } else {
+                return false
+            }
+        }
         anchors {
             top: onlineStateLabel.bottom
             topMargin: units.gu(3)

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-11 11:46:39 +0000
+++ debian/changelog	2014-10-11 18:41:23 +0000
@@ -12,6 +12,8 @@
   * Synced ListItemWithActions with upstream
   * Delayed loading of AlarmModel to improve app startup time (LP: #1362140)
   * Fixed alarm page header width warning and corrected icon spacing.
+  * Delayed loading of xmltimezone model until add world city page is loaded and
+    dynamically load/unload the jsontimezone model only when necessary.
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second