Merge lp:~ken-vandine/friends-app/page_for_flickable into lp:friends-app

[Ken VanDine]

Make TimeLine a Page and set flickable to the listview to fix issues with the header

Make TimeLine a Page and set flickable to the listview to fix issues with the header

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/friends-app-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1176
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/999

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

review: Approve (continuous-integration)

=== modified file 'qml/TimeLine.qml'
--- qml/TimeLine.qml	2013-04-11 15:39:15 +0000
+++ qml/TimeLine.qml	2013-07-16 19:55:29 +0000
@@ -21,11 +21,13 @@
 import Ubuntu.Components.ListItems 0.1
 import Friends 0.1
 
-Rectangle {
+Page {
+    title: i18n.tr("Timeline")
+    flickable: listView
+
     property string stream: ""
     property int unseen: 0
     property string search
-    color: "#f8f8f8"
 
     /* Jump to the bottom of the view and set the currentIndex */
     function jumpToBottom () {
@@ -117,8 +119,12 @@
 
         preferredHighlightBegin: 0
         preferredHighlightEnd: preferredHighlightBegin
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        //highlight: Rectangle { color: "black"; opacity: 0.1 }
+        /* We need highlightRangeMode for keyboard navigation,
+         * but it forces the page header to stay hidden
+         * https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1201936
+         *
+         * highlightRangeMode: ListView.StrictlyEnforceRange
+        */
 
         onCurrentIndexChanged: {
             if (currentIndex == 0) {

=== modified file 'qml/friends-app.qml'
--- qml/friends-app.qml	2013-06-26 20:06:39 +0000
+++ qml/friends-app.qml	2013-07-16 19:55:29 +0000
@@ -46,7 +46,7 @@
         anchors.fill: parent
         Component.onCompleted: {
             console.log ("accounts.count: "+accounts.count);
-            pageStack.push(timelinePage);
+            pageStack.push(timeline);
             if (accounts.count < 1)
                 pageStack.push(noAccountsPage);
         }
@@ -79,16 +79,12 @@
             }
         }
 
-        Page {
-            id: timelinePage
-            title: i18n.tr("Timeline")
+        TimeLine {
+            id: timeline
+            anchors {
+                fill: parent
+            }
             visible: false
-            TimeLine {
-                id: timeline
-                anchors {
-                    fill: parent
-                }
-            }
             tools: ToolbarItems {
                 ToolbarButton {
                     text: i18n.tr("Top")