Merge lp:~nik90/ubuntu-clock-app/replace-base-list-items into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Replaces the use of ListItem.Base with ListItem.Empty throughout the clock app for performance reasons.

This MP replaces the use of ListItem.Base with ListItem.Empty throughout the clock app for the following reasons,

- ListItem.Base is a basic listitem which provides support for Icon and progression icon as per SDK API docs. However in the clock app we don't need support of either of them since we don't use it :). As such the ListItem.Empty would suit us better (with no visual changes)

- ListItem.Empty in all cases that I have tested is created in about ~2.5ms while ListItem.Base takes about ~5.5ms to be created. We are thereby improving the performance (slightly). This becomes important when considering the WorldCityList.qml file where we have a listview. By switching the delegates to ListItem.Empty we save a good amount of creation time (cumulatively speaking).

Ofc here is the proof ;-)

Old Performance -> https://i.imgur.com/hJj4qxD.png
New Performance -> https://i.imgur.com/IHktYgS.png

WorldCityDelegate performance

Old Performance -> https://i.imgur.com/NHETQiP.png
New Performance -> https://i.imgur.com/DexJEvc.png (reduces total creation time by 25ms in total)

[lp:~nik90/ubuntu-clock-app/replace-base-list-items]

151. By Nekhelesh Ramananthan on 2014-10-15

Updated debian changelog

152. By Nekhelesh Ramananthan on 2014-10-15

merged trunk

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

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

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm

review: Approve

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2014-09-24 11:03:50 +0000
+++ app/alarm/AlarmSettingsPage.qml	2014-10-15 21:01:42 +0000
@@ -85,19 +85,27 @@
                 right: parent.right
             }
 
-            ListItem.Base {
+            ListItem.Empty {
                 height: 2 * implicitHeight
 
                 Label {
                     color: UbuntuColors.midAubergine
                     text: i18n.tr("Alarm volume")
-                    anchors.top: parent.top
-                    anchors.topMargin: units.gu(1)
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        top: parent.top
+                        topMargin: units.gu(1)
+                    }
                 }
 
                 Slider {
-                    anchors.centerIn: parent
-                    width: parent.width
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        margins: units.gu(2)
+                        verticalCenter: parent.verticalCenter
+                    }
 
                     minimumValue: 1
                     maximumValue: 100
@@ -145,6 +153,7 @@
                                 width: units.gu(2)
                                 height: width
                                 anchors.right: parent.right
+                                anchors.rightMargin: units.gu(2)
                                 anchors.verticalCenter: parent.verticalCenter
 
                                 name: "go-down"
@@ -212,6 +221,7 @@
                                 width: units.gu(2)
                                 height: width
                                 anchors.right: parent.right
+                                anchors.rightMargin: units.gu(2)
                                 anchors.verticalCenter: parent.verticalCenter
 
                                 name: "go-down"
@@ -244,11 +254,15 @@
                 }
             }
 
-            ListItem.Base {
+            ListItem.Empty {
                 Label {
                     text: i18n.tr("Vibration")
                     color: UbuntuColors.midAubergine
-                    anchors.verticalCenter: parent.verticalCenter
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        verticalCenter: parent.verticalCenter
+                    }
                 }
 
                 Switch {
@@ -256,6 +270,7 @@
 
                     anchors {
                         right: parent.right
+                        rightMargin: units.gu(2)
                         verticalCenter: parent.verticalCenter
                     }
 

=== modified file 'app/components/SubtitledListItem.qml'
--- app/components/SubtitledListItem.qml	2014-08-24 12:47:50 +0000
+++ app/components/SubtitledListItem.qml	2014-10-15 21:01:42 +0000
@@ -27,7 +27,7 @@
   #TODO: Revert to using the SDK Subtitled Component when they change the
   design to match the new clock app design.
  */
-ListItem.Base {
+ListItem.Empty {
     id: _subtitledContainer
 
     // Property to set the main text label
@@ -39,7 +39,12 @@
     Column {
         id: _labelColumn
         
-        anchors.verticalCenter: parent.verticalCenter
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
         
         Label {
             id: _mainText

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2014-10-14 13:48:02 +0000
+++ app/worldclock/WorldCityList.qml	2014-10-15 21:01:42 +0000
@@ -300,7 +300,7 @@
             text: section
         }
 
-        delegate: ListItem.Base {
+        delegate: ListItem.Empty {
             showDivider: false
             objectName: "defaultWorldCityItem" + index
 
@@ -309,6 +309,7 @@
 
                 anchors {
                     left: parent.left
+                    leftMargin: units.gu(2)
                     right: _localTime.left
                     rightMargin: units.gu(1)
                     verticalCenter: parent.verticalCenter
@@ -336,6 +337,7 @@
                 text: localTime
                 anchors {
                     right: parent.right
+                    rightMargin: units.gu(2)
                     verticalCenter: parent.verticalCenter
                 }
             }

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-15 18:25:23 +0000
+++ debian/changelog	2014-10-15 21:01:42 +0000
@@ -19,6 +19,8 @@
     dynamically load/unload the jsontimezone model only when necessary.
   * Removed hardcoded delete alarm button size and let it adapt to the label size
     dynamically (LP: #1381429)
+  * Replaced ListItem.Base with ListItem.Empty throughout the clock app to reduce
+    creation time (performance).
   * Customised splash screen (white background) (LP: #1377638)
 
   [Akiva Shammai Avraham]