Merge lp:~nik90/ubuntu-clock-app/delay-alarm-model-startup into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Improve startup time by delaying the loading the alarm model at app startup.

Improve startup time by delaying the loading the alarm model at app startup.

The improvements reduces the start time by 647.8 ms (~23.73%)! There is still room for improvement, but I will experiment on that in my next MP.

@Riccardo, this is the exact same MP that you previously approved at https://code.launchpad.net/~nik90/ubuntu-clock-app/conditionally-load-alarmmodel/+merge/232412. I had to reject the old one since it was out of sync from trunk and the branches had diverged. Also there was a corner case where it caused the clock app to freeze which I have fixed in this MP.

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

FAILED: Continuous integration, rev:142
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/549/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/865/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:144
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/550/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/866/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Tested: no way to freeze it during the startup, and code looks good!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/200/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/883/console

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/delay-alarm-model-startup]

148. By Nekhelesh Ramananthan on 2014-10-11

Merged with trunk

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

review: Approve (continuous-integration)

=== added file 'app/alarm/AlarmModelComponent.qml'
--- app/alarm/AlarmModelComponent.qml	1970-01-01 00:00:00 +0000
+++ app/alarm/AlarmModelComponent.qml	2014-10-11 11:46:50 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+AlarmModel {
+    id: alarmModel
+    Component.onCompleted: console.log("[LOG]: Alarm Database loaded")
+}

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2014-10-11 10:18:38 +0000
+++ app/alarm/AlarmPage.qml	2014-10-11 11:46:50 +0000
@@ -23,8 +23,6 @@
 Page {
     id: alarmPage
 
-    property var alarmModel
-
     title: i18n.tr("Alarms")
     objectName: 'AlarmPage'
 
@@ -133,7 +131,7 @@
     }
 
     EmptyState {
-        visible: alarmModel.count === 0
+        visible: alarmModel ? alarmModel.count === 0 : true
         anchors.verticalCenter: parent.verticalCenter
 
         iconName: "alarm-clock"

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-10-09 16:40:31 +0000
+++ app/alarm/EditAlarmPage.qml	2014-10-11 11:46:50 +0000
@@ -34,6 +34,7 @@
     // Property to store the index of the alarm to be edited
     property int alarmIndex
 
+    // Temporary alarm used to read saved alarm and modify them
     property var tempAlarm
 
     title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-10-10 14:54:31 +0000
+++ app/clock/ClockPage.qml	2014-10-11 11:46:50 +0000
@@ -40,7 +40,7 @@
 
     Component.onCompleted: {
         console.log("[LOG]: Clock Page loaded")
-        _clockPage.setBottomEdgePage(Qt.resolvedUrl("../alarm/AlarmPage.qml"), { alarmModel: alarmModel })
+        _clockPage.setBottomEdgePage(Qt.resolvedUrl("../alarm/AlarmPage.qml"), {})
     }
 
     AlarmUtils {

=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml	2014-10-09 10:16:42 +0000
+++ app/clock/MainClock.qml	2014-10-11 11:46:50 +0000
@@ -89,4 +89,22 @@
             }
         }
     }
+
+    /*
+     Only when the startup animation is complete, proceed to load the
+     alarm model
+    */
+    Connections {
+        target: digitalModeLoader.item
+        onAnimationComplete: {
+            alarmModelLoader.source = Qt.resolvedUrl("../alarm/AlarmModelComponent.qml")
+        }
+    }
+
+    Connections {
+        target: analogModeLoader.item
+        onAnimationComplete: {
+            alarmModelLoader.source = Qt.resolvedUrl("../alarm/AlarmModelComponent.qml")
+        }
+    }
 }

=== modified file 'app/components/AnalogMode.qml'
--- app/components/AnalogMode.qml	2014-10-07 08:01:14 +0000
+++ app/components/AnalogMode.qml	2014-10-11 11:46:50 +0000
@@ -28,6 +28,8 @@
     // Property to show/hide the seconds hand
     property bool showSeconds
 
+    signal animationComplete()
+
     function startAnimation() {
         _animationTimer.start()
     }
@@ -90,12 +92,20 @@
         source: "../graphics/Knob.png"
     }
 
-    PropertyAnimation {
+    SequentialAnimation {
         id: _innerCircleAnimation
-        target: _innerCircleAnalog
-        property: "width"
-        from: units.gu(0)
-        to: maxWidth
-        duration: 900
+
+        PropertyAnimation {
+            target: _innerCircleAnalog
+            property: "width"
+            from: units.gu(0)
+            to: maxWidth
+            duration: 900
+        }
+
+        // Fire signal that the animation is complete.
+        ScriptAction {
+            script: animationComplete()
+        }
     }
 }

=== modified file 'app/components/Background.qml'
--- app/components/Background.qml	2014-09-20 10:47:21 +0000
+++ app/components/Background.qml	2014-10-11 11:46:50 +0000
@@ -26,6 +26,7 @@
 Image {
     id: _background
 
+    asynchronous: true
     anchors.fill: parent
     source: "../graphics/Background_Texture.jpg"
 }

=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml	2014-08-24 12:47:50 +0000
+++ app/components/DigitalMode.qml	2014-10-11 11:46:50 +0000
@@ -33,6 +33,8 @@
     property int maxTimeFontSize
     property int maxPeriodFontSize
 
+    signal animationComplete()
+
     function startAnimation() {
         _animationTimer.start()
     }
@@ -94,31 +96,38 @@
         }
     }
 
-    ParallelAnimation {
+    SequentialAnimation {
         id: _innerCircleAnimation
 
-        PropertyAnimation {
-            target: _innerCircle
-            property: "width"
-            from: units.gu(0)
-            to: maxWidth
-            duration: 900
-        }
-
-        PropertyAnimation {
-            target: _digitalTime
-            property: "font.pixelSize"
-            from: units.dp(1)
-            to: maxTimeFontSize
-            duration: 900
-        }
-
-        PropertyAnimation {
-            target: _digitalTimePeriod
-            property: "font.pixelSize"
-            from: units.dp(1)
-            to: maxPeriodFontSize
-            duration: 900
+        ParallelAnimation {
+            PropertyAnimation {
+                target: _innerCircle
+                property: "width"
+                from: units.gu(0)
+                to: maxWidth
+                duration: 900
+            }
+
+            PropertyAnimation {
+                target: _digitalTime
+                property: "font.pixelSize"
+                from: units.dp(1)
+                to: maxTimeFontSize
+                duration: 900
+            }
+
+            PropertyAnimation {
+                target: _digitalTimePeriod
+                property: "font.pixelSize"
+                from: units.dp(1)
+                to: maxPeriodFontSize
+                duration: 900
+            }
+        }
+
+        // Fire signal that the animation is complete.
+        ScriptAction {
+            script: animationComplete()
         }
     }
 }

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2014-10-09 17:04:41 +0000
+++ app/ubuntu-clock-app.qml	2014-10-11 11:46:50 +0000
@@ -71,11 +71,6 @@
         defaults: { "digitalMode": false }
     }
 
-    AlarmModel {
-        id: alarmModel
-        Component.onCompleted: console.log("[LOG]: Alarm Database loaded")
-    }
-
     DateTime {
         id: localTimeSource
         updateInterval: 1000
@@ -93,6 +88,11 @@
         ClockPage {
             id: clockPage
 
+            Loader {
+                id: alarmModelLoader
+                asynchronous: false
+            }
+
             /*
               #FIXME: When the SDK support hiding the header, then enable the
               clock page title. This will then set the correct window title on
@@ -116,7 +116,8 @@
               possible to receive a datetime object directly instead of using this hack.
             */
 
-            alarmModel: alarmModel
+            alarmModel: alarmModelLoader.item
+            bottomEdgeEnabled: alarmModelLoader.status === Loader.Ready
             clockTime: new Date
                        (
                            localTimeSource.localDateString.split(":")[0],

=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml	2014-10-02 21:53:50 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml	2014-10-11 11:46:50 +0000
@@ -148,6 +148,8 @@
         property bool hiden: (activeFocus === false) ||
                              ((bottomEdge.y - units.gu(1)) < tip.y)
 
+        property bool isAnimating: true
+
         enabled: mouseArea.enabled
         visible: page.bottomEdgeEnabled
         anchors {
@@ -163,6 +165,9 @@
                     UbuntuNumberAnimation {
                         duration: UbuntuAnimation.SnapDuration
                     }
+                    ScriptAction {
+                        script: tip.isAnimating = false
+                    }
                 }
             }
         }

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-11 10:19:26 +0000
+++ debian/changelog	2014-10-11 11:46:50 +0000
@@ -10,6 +10,7 @@
     only. (LP: #1377538)
   * Tweaked bottom edge to show the time to the next active alarm (LP: #1290793)
   * 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.
 
   [Akiva Shammai Avraham]

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-10-10 01:54:53 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-10-11 11:46:50 +0000
@@ -54,7 +54,7 @@
         clockPage = self.open_clock()
         clockPage.reveal_bottom_edge_page()
         self.get_header().visible.wait_for(True)
-        return self.wait_select_single(AlarmPage)
+        return self.wait_select_single(Page11)
 
     def get_AlarmList(self):
         """ Get the AlarmList object. """
@@ -93,6 +93,7 @@
             action_item = self.wait_select_single(objectName='bottomEdgeTip')
             action_item.hiden.wait_for(False)
             action_item.enabled.wait_for(True)
+            action_item.isAnimating.wait_for(False)
             start_x = (action_item.globalRect.x +
                        (action_item.globalRect.width * 0.5))
             start_y = (action_item.globalRect.y +
@@ -178,7 +179,7 @@
         self.pointing_device.click_object(deleteButton)
 
 
-class AlarmPage(Page):
+class Page11(Page):
     """Autopilot helper for the Alarm page."""
 
     @autopilot_logging.log_action(logger.info)

=== modified file 'tests/unit/tst_alarm.qml'
--- tests/unit/tst_alarm.qml	2014-10-10 10:16:50 +0000
+++ tests/unit/tst_alarm.qml	2014-10-11 11:46:50 +0000
@@ -61,7 +61,6 @@
 
     AlarmPage {
         id: alarmPage
-        alarmModel: alarmModel
     }
 
     UbuntuTestCase {