Merge lp:~nik90/ubuntu-clock-app/fix-jarring-alarm-header into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Fix the alarm head animation being jarring by introducing a nice slide in animation.

Fix the alarm head animation being jarring by introducing a nice slide in animation.

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

FAILED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/418/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/136/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/65

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/fix-jarring-alarm-header]

78. By Nekhelesh Ramananthan on 2014-09-01

Replaced fake header background

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

FAILED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/419/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/137/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/66

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/fix-jarring-alarm-header]

79. By Nekhelesh Ramananthan on 2014-09-01

Added license header and simplified fake header

80. By Nekhelesh Ramananthan on 2014-09-01

Reverted manifest file change

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

FAILED: Continuous integration, rev:80
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/420/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/138/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/67

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

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

68 + y: ((-fakeHeader.height * bottomEdge.y) / page.height) + units.gu(1.1)

Deal with it, it's a magic number!

Lgtm

review: Approve

[lp:~nik90/ubuntu-clock-app/fix-jarring-alarm-header]

81. By Nekhelesh Ramananthan on 2014-09-02

Removed hack thanks to riccardo

[Riccardo Padovani (rpadovani)]

Reapproved, hack removed as discussed on IRC :-)

[lp:~nik90/ubuntu-clock-app/fix-jarring-alarm-header]

82. By Nekhelesh Ramananthan on 2014-09-02

Updated changelog

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

FAILED: Continuous integration, rev:81
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/260/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/143/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/260

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/260/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:81
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/426/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/73

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:82
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/261/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/144/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/261

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/261/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:82
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/427/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/74

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:82
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/430/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/77

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file 'app/upstreamcomponents/FakeHeader.qml'
--- app/upstreamcomponents/FakeHeader.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/FakeHeader.qml	2014-09-02 17:14:49 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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
+
+Column {
+    id: fakeHeader
+
+    height: units.gu(9)
+
+    Rectangle {
+        height: units.gu(7)
+        width: parent.width
+        color: Theme.palette.normal.background
+    }
+    
+    Rectangle {
+        color: "#C9C9C9"
+        height: units.gu(2)
+        anchors.left: parent.left
+        anchors.right: parent.right
+    }
+}

=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml	2014-08-07 00:05:45 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml	2014-09-02 17:14:49 +0000
@@ -77,7 +77,7 @@
     property bool reloadBottomEdgePage: true
 
     readonly property alias bottomEdgePage: edgeLoader.item
-    readonly property bool isReady: ((bottomEdge.y === 0) && bottomEdgePageLoaded && edgeLoader.item.active)
+    readonly property bool isReady: ((bottomEdge.y === fakeHeader.height) && bottomEdgePageLoaded && edgeLoader.item.active)
     readonly property bool isCollapsed: (bottomEdge.y === page.height)
     readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
 
@@ -151,12 +151,29 @@
         onTriggered: tip.hiden = true
     }
 
+    FakeHeader {
+        id: fakeHeader
+
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        y: -fakeHeader.height + (fakeHeader.height * (page.height - bottomEdge.y)) / (page.height - fakeHeader.height)
+        z: bgVisual.z + 1
+
+        Behavior on y {
+            UbuntuNumberAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+    }
+
     Rectangle {
         id: bottomEdge
         objectName: "bottomEdge"
 
         readonly property int tipHeight: units.gu(3)
-        readonly property int pageStartY: 0
+        readonly property int pageStartY: fakeHeader.height
 
         z: 1
         color: Theme.palette.normal.background
@@ -270,6 +287,10 @@
                     y: bottomEdge.height
                 }
                 PropertyChanges {
+                    target: fakeHeader
+                    y: -fakeHeader.height
+                }
+                PropertyChanges {
                     target: tip
                     opacity: 1.0
                 }
@@ -285,6 +306,10 @@
                     y: bottomEdge.pageStartY
                 }
                 PropertyChanges {
+                    target: fakeHeader
+                    y: 0
+                }
+                PropertyChanges {
                     target: hideIndicator
                     running: false
                 }
@@ -311,10 +336,17 @@
             Transition {
                 to: "expanded"
                 SequentialAnimation {
-                    UbuntuNumberAnimation {
-                        target: bottomEdge
-                        property: "y"
-                        duration: UbuntuAnimation.SlowDuration
+                    ParallelAnimation {
+                        UbuntuNumberAnimation {
+                            target: bottomEdge
+                            property: "y"
+                            duration: UbuntuAnimation.SlowDuration
+                        }
+                        UbuntuNumberAnimation {
+                            target: fakeHeader
+                            property: "y"
+                            duration: UbuntuAnimation.SlowDuration
+                        }
                     }
                     ScriptAction {
                         script: page._pushPage()
@@ -333,10 +365,17 @@
                             edgeLoader.item.active = false
                         }
                     }
-                    UbuntuNumberAnimation {
-                        target: bottomEdge
-                        property: "y"
-                        duration: UbuntuAnimation.SlowDuration
+                    ParallelAnimation {
+                        UbuntuNumberAnimation {
+                            target: bottomEdge
+                            property: "y"
+                            duration: UbuntuAnimation.SlowDuration
+                        }
+                        UbuntuNumberAnimation {
+                            target: fakeHeader
+                            property: "y"
+                            duration: UbuntuAnimation.SlowDuration
+                        }
                     }
                     ScriptAction {
                         script: {

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-26 14:07:50 +0000
+++ debian/changelog	2014-09-02 17:14:49 +0000
@@ -19,6 +19,7 @@
   * Updated QtQuick library imports to v2.3
   * Switched bzr branch to lp:ubuntu-clock-app
   * Updated pot file name
+  * Fixed the transition animation to alarms to be more smoother (LP: #1362081)
 
   [Zsombor Egri]
   * Fixed alarm status toggle being reverted immediately (LP: #1272337)