Merge lp:~boiko/dialer-app/add_timeline into lp:dialer-app

[Gustavo Pichorim Boiko]

Add a timeline indicator in the call log view.

Add a timeline indicator in the call log view.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-i386-ci/54

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dialer-app-ci/54/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good.

review: Approve

=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2013-09-09 19:08:23 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2013-09-24 19:11:36 +0000
@@ -31,6 +31,7 @@
     property bool incoming: model.senderId != "self"
     property bool unknownContact: contactWatcher.contactId == ""
     property string phoneNumberSubTypeLabel: ""
+    property alias isFirst: timeline.isFirst
 
     height: units.gu(9)
     removable: true
@@ -123,8 +124,6 @@
         anchors.right: phoneIcon.left
         anchors.top: parent.top
         anchors.bottom: parent.bottom
-        anchors.topMargin: units.gu(1)
-        anchors.bottomMargin: units.gu(1)
 
         UbuntuShape {
             id: time
@@ -144,10 +143,19 @@
             }
         }
 
+        Timeline {
+            id: timeline
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: time.right
+            anchors.leftMargin: units.gu(0.5)
+        }
+
         UbuntuShape {
             id: avatar
-            anchors.left: time.right
-            anchors.leftMargin: units.gu(3.5)
+            anchors.left: timeline.right
+            anchors.leftMargin: units.gu(1)
+            anchors.verticalCenter: parent.verticalCenter
             height: units.gu(7)
             width: height
             image: Image {
@@ -180,7 +188,7 @@
 
         Column {
             width: childrenRect.width
-            anchors.top: parent.top
+            anchors.top: avatar.top
             anchors.bottom: parent.bottom
             anchors.left: avatar.right
             anchors.leftMargin: units.gu(2)

=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
--- src/qml/HistoryPage/HistoryPage.qml	2013-08-29 16:51:59 +0000
+++ src/qml/HistoryPage/HistoryPage.qml	2013-09-24 19:11:36 +0000
@@ -62,6 +62,9 @@
         currentIndex: -1
         section.property: "date"
         section.delegate: Item {
+            ListItem.ThinDivider {
+                anchors.top: parent.top
+            }
             anchors.left: parent.left
             anchors.right: parent.right
             height: units.gu(5)
@@ -90,6 +93,7 @@
                 anchors.right: parent.right
                 anchors.top: parent.top
                 onClicked: mainView.call(model.participants[0])
+                isFirst: model.index == 0
             }
 
             asynchronous: true

=== added file 'src/qml/HistoryPage/Timeline.qml'
--- src/qml/HistoryPage/Timeline.qml	1970-01-01 00:00:00 +0000
+++ src/qml/HistoryPage/Timeline.qml	2013-09-24 19:11:36 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2012-2013 Canonical Ltd.
+ *
+ * This file is part of dialer-app.
+ *
+ * dialer-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * dialer-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.0
+import Ubuntu.Components 0.1
+
+Item {
+    property bool isFirst: false
+
+    width: units.gu(2)
+    height: units.gu(10)
+
+    BorderImage {
+        id: topLine
+        visible: !isFirst
+        anchors.top: parent.top
+        anchors.bottom: circle.top
+        anchors.verticalCenter: circle.verticalCenter
+        source: "../assets/timeline_vertical_line.sci"
+        smooth: true
+    }
+
+    Image {
+        id: circle
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.horizontalCenter: parent.horizontalCenter
+        source: "../assets/timeline_circle.png"
+        smooth: true
+    }
+
+    BorderImage {
+        id: bottomLine
+        anchors.top: circle.bottom
+        anchors.bottom: parent.bottom
+        anchors.verticalCenter: circle.verticalCenter
+        source: "../assets/timeline_vertical_line.sci"
+        smooth: true
+    }
+}

=== added file 'src/qml/assets/[e-mail]'
Binary files src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000 and src/qml/assets/[e-mail]	2013-09-24 19:11:36 +0000 differ
=== added file 'src/qml/assets/[e-mail]'
Binary files src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000 and src/qml/assets/[e-mail]	2013-09-24 19:11:36 +0000 differ
=== added file 'src/qml/assets/[e-mail]'
--- src/qml/assets/[e-mail]	1970-01-01 00:00:00 +0000
+++ src/qml/assets/[e-mail]	2013-09-24 19:11:36 +0000
@@ -0,0 +1,5 @@
+border.left: 20
+border.top: 0
+border.bottom: 0
+border.right: 20
+source: [e-mail]
\ No newline at end of file