Merge lp:ubuntu-facebook-app into lp:~kedazo/ubuntu-facebook-app/ci-fix

[David Kedves]

Dropped the shldibdeps, as there are no binaries in the package.

[lp:ubuntu-facebook-app]

3. By Michael Hall on 2013-04-18

Updates packaging and icon for a better install.

Approved by Hugo Miguel Barbarrica Rodrigues Lima, Ubuntu Phone Apps Jenkins Bot.

4. By Hugo Miguel Barbarrica Rodrigues Lima on 2013-04-19

Initial version with login and news feed.

Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.

5. By Hugo Miguel Barbarrica Rodrigues Lima on 2013-05-31

Initial development:

- List comments and likes
- Post a comment
- Like / Unlike post.

Approved by Michael Hall, Ubuntu Phone Apps Jenkins Bot.

6. By Riccardo Padovani on 2013-05-31

Fix #1173261. Fixes: https://bugs.launchpad.net/bugs/1173261.

Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.

7. By Florian Boucault on 2013-06-27

Remove use of theming because the theming infrastructure in the toolkit is going to change drastically.

The theme was copied over almost entirely from the toolkit which should not be done. There was however one significant difference: the header background and height were customized. That capability might be introduced differently in the future. For now no custom header unfortunately.

Approved by Ubuntu Phone Apps Jenkins Bot, Hugo Miguel Barbarrica Rodrigues Lima.

8. By Robert Bruce Park on 2013-09-09

Stop using deprecated image://gicon.

Unmerged revisions

8. By Robert Bruce Park on 2013-09-09

Stop using deprecated image://gicon.

7. By Florian Boucault on 2013-06-27

Remove use of theming because the theming infrastructure in the toolkit is going to change drastically.

The theme was copied over almost entirely from the toolkit which should not be done. There was however one significant difference: the header background and height were customized. That capability might be introduced differently in the future. For now no custom header unfortunately.

Approved by Ubuntu Phone Apps Jenkins Bot, Hugo Miguel Barbarrica Rodrigues Lima.

6. By Riccardo Padovani on 2013-05-31

Fix #1173261. Fixes: https://bugs.launchpad.net/bugs/1173261.

Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.

5. By Hugo Miguel Barbarrica Rodrigues Lima on 2013-05-31

Initial development:

- List comments and likes
- Post a comment
- Like / Unlike post.

Approved by Michael Hall, Ubuntu Phone Apps Jenkins Bot.

4. By Hugo Miguel Barbarrica Rodrigues Lima on 2013-04-19

Initial version with login and news feed.

Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.

3. By Michael Hall on 2013-04-18

Updates packaging and icon for a better install.

Approved by Hugo Miguel Barbarrica Rodrigues Lima, Ubuntu Phone Apps Jenkins Bot.

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-09-09 19:09:28 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-09-09 19:09:28 +0000
@@ -0,0 +1,7 @@
+*.qmlproject.user
+*.~*~
+
+debian/files
+debian/app-template/
+debian/*.debhelper.log
+debian/*.substvars

=== modified file 'AuthModel.qml'
--- AuthModel.qml	2013-03-30 01:52:44 +0000
+++ AuthModel.qml	2013-09-09 19:09:28 +0000
@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import QtQuick.LocalStorage 2.0
 import Ubuntu.OnlineAccounts 0.1
+import "facebook.js" as FacebookFuncs
 import "auth.js" as AuthFuncs
 
 Item {

=== added file 'CommentsPanel.qml'
--- CommentsPanel.qml	1970-01-01 00:00:00 +0000
+++ CommentsPanel.qml	2013-09-09 19:09:28 +0000
@@ -0,0 +1,236 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Friends 0.1
+import "facebook.js" as FacebookFuncs
+
+Rectangle {
+    color: "#F6F7F8"
+    height: likeLabels.height + replyPanel.height + units.gu(2)
+
+    property int commentsCountProp
+    property bool liked: column_13
+
+    FriendsDispatcher {
+        id: friends
+        onSendComplete: {
+            if (success) {
+                commentField.text = '';
+                console.log ("Send completed successfully");
+            } else {
+                console.log ("Send failed: " + errorMessage);
+            }
+            commentField.enabled = true;
+            postButton.enabled = true;
+            loadingIndicator.visible = false;
+        }
+
+        onLikeComplete: {
+             if (success) {
+                liked = true;
+             } else {
+                 console.log ("Like failed: " + errorMessage);
+             }
+             likeLinkMouseArea.enabled = true;
+             likeLink.color = "#7CA1E4";
+         }
+        onUnlikeComplete: {
+             if (success) {
+                 liked = false;
+             } else {
+                 console.log ("UnLike failed: " + errorMessage);
+             }
+             likeLinkMouseArea.enabled = true;
+             likeLink.color = "#7CA1E4";
+         }
+
+    }
+
+    Row {
+        id: likeLabels
+        anchors.left: parent.left
+        anchors.top: parent.top
+        spacing: units.gu(1)
+        anchors.leftMargin: units.gu(1)
+        anchors.topMargin: units.gu(1)
+
+        Label {
+            id: likeLink
+            text: (liked?"Unlike":"Like")
+            color: "#7CA1E4"
+            MouseArea {
+                id: likeLinkMouseArea
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: likeLabels.height + units.gu(1)
+
+                onClicked: {
+                    likeLinkMouseArea.enabled = false;
+                    likeLink.color = "#A6A7A8";
+                    if (liked) {
+                        friends.unlikeAsync(accountId, postMessageId);
+                        console.log('unlike accountId:' + accountId + ', messageId' + postMessageId);
+                    }
+                    else {
+                        friends.likeAsync(accountId, postMessageId);
+                        console.log('like accountId:' + accountId + ', messageId' + postMessageId);
+                    }
+                }
+            }
+        }
+
+        Label {
+            text: "-"
+        }
+
+        Label {
+            text: "Comment"
+            color: "#7CA1E4"
+            MouseArea {
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: likeLabels.height + units.gu(1)
+
+                onClicked: openReplyPanel()
+            }
+        }
+    }
+
+    Row {
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.rightMargin: units.gu(1)
+        anchors.topMargin: units.gu(1)
+
+        spacing: units.gu(1)
+
+        Row {
+            visible: (postLikes > 0)
+            Image {
+                source: Qt.resolvedUrl("images/like.png")
+            }
+
+            Label {
+                text: postLikes
+            }
+        }
+
+
+        Row {
+            id: commentsCountWidget
+            visible: false
+
+            Image {
+                source: Qt.resolvedUrl("images/comment.png")
+            }
+
+            Label {
+                text: commentsCountProp
+            }
+        }
+    }
+
+
+    Item {
+        anchors.top: likeLabels.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        id: replyPanel
+        visible: false
+        height: (visible?childrenRect.height+units.gu(1):0)
+
+        TextArea {
+            id: commentField
+            anchors.top: parent.top
+            anchors.topMargin: units.gu(1)
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(1)
+            anchors.right: postButton.left
+            anchors.rightMargin: units.gu(1)
+            placeholderText: "Write a comment"
+            font.pixelSize: FontUtils.sizeToPixels("medium")
+            font.family: "Ubuntu"
+            Keys.onReturnPressed: postButton.clicked(null)
+            Keys.onEscapePressed: text = ""
+            autoSize: true
+            maximumLineCount: 0
+        }
+
+        Button {
+            id: postButton
+            anchors.top: parent.top
+            anchors.topMargin: units.gu(1)
+            anchors.right: parent.right
+            anchors.rightMargin: units.gu(1)
+            text: "Post"
+
+            onClicked: {
+                console.log ("Reply to " + postMessageId + " from " + accountId + ": " + commentField.text);
+                loadingIndicator.visible = true
+                postButton.enabled = false
+                commentField.enabled = false
+                friends.sendReplyAsync(accountId, postMessageId, commentField.text);
+            }
+        }
+
+        Item {
+            id: loadingIndicator
+            visible: true
+            anchors.top: commentField.bottom
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(1)
+            anchors.right: parent.right
+            anchors.rightMargin: units.gu(1)
+            height: units.gu(8)
+
+            ActivityIndicator {
+                anchors.centerIn: parent
+                running: visible
+            }
+        }
+
+        Loader {
+            id: threadView
+            anchors.top: commentField.bottom
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(1)
+            anchors.right: parent.right
+            anchors.rightMargin: units.gu(1)
+
+            property alias loadingIndicator: loadingIndicator
+
+            source: (replyPanel.visible?'ThreadView.qml':'')
+        }
+    }
+
+    MouseArea {
+        anchors.top: parent.top
+        anchors.left: likeLabels.right
+        anchors.right: parent.right
+        height: likeLabels.height + units.gu(1)
+
+        onClicked: openReplyPanel()
+    }
+
+    Component.onCompleted: {
+        console.log('CommentsPanel loaded');
+        console.log('PostMessageId:'+postMessageId);
+        FacebookFuncs.getCommentCount(token, postMessageId).done(function(commentsCount) {
+            console.log('FacebookFuncs.getCommentCount:'+commentsCount);
+            if (commentsCount>0) {
+                commentsCountWidget.visible=true;
+                commentsCountProp=commentsCount;
+            }
+        }).fail(function(e) {
+            console.log('FacebookFuncs.getCommentCount:'+e);
+        });
+    }
+
+    function openReplyPanel() {
+        replyPanel.visible = ! replyPanel.visible;
+        if (replyPanel.visible)
+            loadingIndicator.visible=true;
+    }
+}

=== modified file 'LoginPopup.qml'
--- LoginPopup.qml	2013-03-30 01:52:44 +0000
+++ LoginPopup.qml	2013-09-09 19:09:28 +0000
@@ -42,7 +42,9 @@
             title: "Facebook login"
             doneButton: true
             anchors.fill: parent
-            contentsWidth: units.gu(45)
+
+            contentsWidth: facebookMainView.width
+            contentsHeight: facebookMainView.height
 
             Component.onCompleted: {
                 __rightButton.visible = false;
@@ -78,7 +80,7 @@
                         }
                         ListItem.Standard {
                             text: displayName
-                            icon: "image://gicon/"+accts.provider.iconName
+                            icon: "image://theme/"+accts.provider.iconName
 
                             onClicked: {
                                 if (accountsModel.count>0) {

=== modified file 'NewsPage.qml'
--- NewsPage.qml	2013-04-04 11:16:17 +0000
+++ NewsPage.qml	2013-09-09 19:09:28 +0000
@@ -2,11 +2,13 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Friends 0.1
+import "facebook.js" as FacebookFuncs
 
 Page {
     id: newsPage
 
-    property int accountId: -1
+    property int accountId: facebookMainView.accountId
+    property string token: facebookMainView.token
 
     FriendsUtils {
         id: friendsUtils
@@ -19,6 +21,9 @@
     ListView {
         id: listView
         anchors.fill: parent
+        anchors.leftMargin: units.gu(1)
+        anchors.rightMargin: units.gu(1)
+
         cacheBuffer: parent.height
         opacity: 0.0
 
@@ -26,24 +31,33 @@
             account: newsPage.accountId
         }
 
-        delegate: Item {
+        delegate: Rectangle {
             id: tile
-            height: newsItem.height + actionsBar.height + units.gu(3)
+            height: childrenRect.height
             width: parent.width
-            anchors {
-                margins: units.gu(1)
-            }
-
-            /****************************************
-            Columns name / id
-
-            sender name = 4 or 6 ?
-            message = 9
-            data/time = 8
-            avatar image (cached file) = 10
-            shared image comment = 18
-            shared image uri = 14
-            *****************************************/
+            color: "#FFFFFF"
+
+            property string postService: column_0
+            property string postAccountId: column_1
+            property string postMessageId: column_2
+            property string postStream: column_3
+            property string postSender: column_4
+            property bool postFromMe: column_7
+            property string postTimeString: friendsUtils.createTimeString(column_8)
+            property string postMessage: column_9
+            property string postAvatar: column_10
+            property string postUrl: column_11
+            property int postLikes: column_12 > 0 ? column_12 : postLiked ? 1 : 0
+            property bool postLiked: column_13
+            property string postLinkPicture: column_14
+            property string postLinkName: column_15
+            property string postLLinkUrl: column_16
+            property string postDesc: column_17
+            property string postLinkCaption: column_18
+            property string postLinkIcon: column_19
+            property string postLocation: column_20
+            property string postLatitude: column_21
+            property string postLongitude: column_22
 
             UbuntuShape {
                 id: avatarImage
@@ -54,11 +68,11 @@
                     left: parent.left
                     top: parent.top
                     leftMargin: units.gu(1)
-                    topMargin: units.gu(1)
+                    topMargin: units.gu(3)
                 }
                 image: Image {
                     anchors.fill: parent
-                    source: Qt.resolvedUrl(column_10)
+                    source: Qt.resolvedUrl(postAvatar)
                     asynchronous: true
                     fillMode: Image.PreserveAspectFit
                 }
@@ -66,17 +80,22 @@
 
             Item {
                 id: newsItem
+
                 anchors {
                     left: avatarImage.right
                     right: parent.right
                     top: parent.top
-                    topMargin: units.gu(1)
+                    topMargin: units.gu(3)
                     leftMargin: units.gu(1)
                     bottomMargin: units.gu(1)
                     rightMargin: units.gu(1)
                 }
+
                 height: childrenRect.height + units.gu(2)
+
                 Column {
+                    id: messageColumn
+
                     spacing: units.gu(1)
                     anchors {
                         left: parent.left;
@@ -85,7 +104,7 @@
                     }
                     Label {
                         id: senderName
-                        text: column_4
+                        text: postSender
                         fontSize: "medium"
                         font.bold: true
                         font.family: "Ubuntu"
@@ -94,31 +113,24 @@
 
                     Label {
                         id: message
-                        text: column_9
-                        onLinkActivated: Qt.openUrlExternally(link)
-                        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                        width: parent.width - units.gu(3)
-                        font.family: "Ubuntu"
-                    }
-
-                    Image {
-                        source: Qt.resolvedUrl(column_14)
-                        asynchronous: true
-                        fillMode: Image.PreserveAspectFit
-                        width: (implicitWidth<parent.width - units.gu(3)?implicitWidth:parent.width - units.gu(3))
-                    }
-
-                    Label {
-                        id: imageComment
-                        color: "#a0a0a0"
-                        width: parent.width - units.gu(3)
-                        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                        text: decorateLinks(column_18)
-                        onLinkActivated: Qt.openUrlExternally(link)
-                        fontSize: "small"
-                        font.family: "Ubuntu"
-                    }
-                }
+                        text: postMessage
+                        onLinkActivated: Qt.openUrlExternally(link)
+                        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                        width: parent.width - units.gu(3)
+                        font.family: "Ubuntu"
+                    }
+                }
+
+                Image {
+                    source: Qt.resolvedUrl(postLinkPicture.replace("_s.jpg", "_b.jpg"))
+                    asynchronous: true
+                    fillMode: Image.PreserveAspectCrop
+                    width: tile.width + units.gu(2)
+                    height: (tile.width + units.gu(2)) * (implicitHeight/implicitWidth)
+                    x: 0 - newsItem.x - units.gu(1)
+                    y: messageColumn.height + units.gu(2)
+                }
+
                 Row {
                     anchors.right: parent.right
                     anchors.rightMargin: units.gu(1)
@@ -127,40 +139,32 @@
 
                     Label {
                         id: time
-                        text: friendsUtils.createTimeString(column_8)
+                        text: friendsUtils.createTimeString(postTimeString)
                         fontSize: "small"
                         font.family: "Ubuntu"
                     }
                 }
             }
 
-            Row {
+
+
+            Loader {
                 id: actionsBar
-
                 anchors.top: newsItem.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: units.gu(1)
-                spacing: units.gu(1)
-
-                Button {
-                    width: parent.width * 0.31
-                    text: "like"
-                }
-
-                Button {
-                    width: parent.width * 0.31
-                    text: "comment"
-                }
-
-                Button {
-                    width: parent.width * 0.31
-                    text: "share"
-                }
+                property int postLikes: (column_12 > 0 ? column_12 : column_13 ? 1 : 0)
+                property string postMessageId: column_2
+                property string token: newsPage.token
+
+                visible: (index > listView.indexAt(listView.contentX, listView.contentY)-4) && (index < listView.indexAt(listView.contentX, listView.contentY)+4)
+                source: (visible?'CommentsPanel.qml':'')
             }
 
+
             ThinDivider {
                 id: divider
+                height: units.gu(2)
             }
         }
     }
@@ -189,8 +193,10 @@
     }
 
     function jumpToTop () {
+        /*
         listView.currentIndex = listView.count-1;
         listView.positionViewAtIndex(listView.currentIndex, ListView.Beginning);
+        */
     }
 
     function decorateLinks(message) {

=== added file 'StatusUpdatePopup.qml'
--- StatusUpdatePopup.qml	1970-01-01 00:00:00 +0000
+++ StatusUpdatePopup.qml	2013-09-09 19:09:28 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Friends 0.1
+import Ubuntu.Components.Popups 0.1
+import "facebook.js" as FacebookFuncs
+
+Item {
+    id: statusPopup
+
+    property int accountId: facebookMainView.accountId
+    property string token: facebookMainView.token
+
+    FriendsDispatcher {
+        id: friends
+
+        onSendComplete: {
+              if (success) {
+                  activitySpinner.visible = false;
+                  entryArea.text = "";
+                  console.log ("Send completed successfully");
+                  statusSheet.hide()
+              } else {
+                  activitySpinner.visible = false;
+                  console.log ("Send failed: " + errorMessage);
+              }
+          }
+    }
+
+    Component {
+        id: statusComponent
+
+        ComposerSheet {
+            id: statusSheet
+            title: "Write Post"
+
+            anchors.fill: parent
+
+            contentsWidth: facebookMainView.width
+            contentsHeight: facebookMainView.height
+
+            onConfirmClicked: {
+                activitySpinner.visible = true
+                friends.sendForAccountAsync(accountId, postField.text);
+            }
+
+            Item {
+                width: parent.width
+                height: parent.height
+
+                UbuntuShape {
+                    id: avatarImage
+                    radius: "medium"
+                    height: units.dp(48)
+                    width: units.dp(48)
+
+                    anchors {
+                        left: parent.left
+                        top: parent.top
+                        leftMargin: units.gu(1)
+                        topMargin: units.gu(1)
+                    }
+
+                    image: Image {
+                        anchors.fill: parent
+                        source: FacebookFuncs.getProfilePictureUrl(token)
+                        asynchronous: true
+                        fillMode: Image.PreserveAspectFit
+                    }
+                }
+
+                TextArea {
+                    id: postField
+
+                    anchors {
+                        top: parent.top
+                        topMargin: units.gu(1)
+                        left: avatarImage.right
+                        leftMargin: units.gu(1)
+                        right: parent.right
+                        rightMargin: units.gu(1)
+                    }
+
+                    placeholderText: "What's on your mind?"
+                    font.pixelSize: FontUtils.sizeToPixels("medium")
+                    font.family: "Ubuntu"
+                    autoSize: true
+                    maximumLineCount: 0
+                }
+
+                ActivityIndicator {
+                    id: activitySpinner
+                    anchors.centerIn: postField
+                    visible: false
+                    running: visible
+                }
+
+            }
+
+            Component.onCompleted: {
+            }
+        }
+    }
+
+    Timer {
+        id: initTimer
+        interval: 500
+        repeat: false
+        triggeredOnStart: false
+        running: false
+
+        onTriggered: {
+            PopupUtils.open(statusComponent);
+            console.log("StatusUpdatePopup.open")
+        }
+    }
+
+    function open() {
+        initTimer.start();
+    }
+}

=== added file 'ThreadView.qml'
--- ThreadView.qml	1970-01-01 00:00:00 +0000
+++ ThreadView.qml	2013-09-09 19:09:28 +0000
@@ -0,0 +1,132 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Friends 0.1
+
+Item {
+    id: threadView
+    height: threadListView.height
+
+    property int commentsCount: 0
+
+    StreamModel {
+        id: streamModel
+        stream: "reply_to/"+postMessageId
+    }
+
+
+    FriendsUtils {
+        id: friendsUtils
+    }
+
+    Column {
+        id: threadListView
+        width: parent.width
+        Repeater {
+            width: parent.width
+            model: streamModel
+            delegate: Item {
+                id: threadItem
+                width: parent.width
+                anchors {
+                    left: parent.left
+                    bottomMargin: units.gu(2)
+                }
+                height: status_update_content.height
+
+                UbuntuShape {
+                    id: avatarImage
+                    radius: "small"
+                    height: units.dp(32)
+                    width: units.dp(32)
+                    anchors {
+                        left: parent.left
+                        top: parent.top
+                        leftMargin: units.gu(1)
+                        topMargin: units.gu(1)
+                    }
+                    image: Image {
+                        source: Qt.resolvedUrl(column_10)
+                        asynchronous: true
+                        fillMode: Image.PreserveAspectFit
+                    }
+                }
+
+                Item {
+                    id: status_update_content
+                    anchors {
+                        left: avatarImage.right
+                        right: parent.right
+                        top: parent.top
+                        topMargin: units.gu(1)
+                        leftMargin: units.gu(1)
+                        bottomMargin: units.gu(1)
+                        rightMargin: units.gu(1)
+                    }
+                    width: parent.width - avatarImage.width
+                    height: childrenRect.height + units.gu(1)
+
+                    Column {
+                        width: parent.width
+                        spacing: 0
+                        anchors {
+                            left: parent.left;
+                            right: parent.right
+                            bottomMargin: units.gu(2)
+                        }
+                        Label {
+                            text: column_4
+                            fontSize: "small"
+                            font.bold: true
+                            width: parent.width
+                        }
+                        Label {
+                            id: messageText
+                            text: column_9
+                            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                            width: parent.width - units.gu(3)
+                            fontSize: "small"
+                            onLinkActivated: {
+                                console.log(link + " link activated");
+                                Qt.openUrlExternally(link);
+                            }
+                        }
+                    }
+                    Row {
+                        anchors.right: parent.right
+                        anchors.rightMargin: units.gu(1)
+                        anchors.top: parent.top
+                        spacing: units.gu(1)
+
+                        Text {
+                            id: time
+                            text: friendsUtils.createTimeString(column_8)
+                            font.family: "Ubuntu"
+                            font.pointSize: 8
+                            color: "gray"
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Timer {
+        id: waitTimer
+        interval: 500
+        repeat: true
+        triggeredOnStart: false
+        running: false
+        onTriggered: {
+            if (commentsCount !== streamModel.count)
+                commentsCount=streamModel.count;
+            else {
+                waitTimer.stop()
+                loadingIndicator.visible = false;
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        waitTimer.start()
+    }
+}

=== added directory 'artwork'
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,5 @@
+border.top: 4
+border.bottom: 4
+border.left: 0
+border.right: 0
+source: [e-mail]

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,5 @@
+border.top: 4
+border.bottom: 0
+border.left: 0
+border.right: 0
+source: [e-mail]

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,7 @@
+source: [e-mail]
+border.left: 9
+border.right: 2
+border.top: 9 
+border.bottom: 0
+horizontalTileMode: Stretch
+verticalTileMode: Stretch

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,7 @@
+source: [e-mail]
+border.left: 9
+border.right: 2
+border.top: 9
+border.bottom: 0
+horizontalTileMode: Stretch
+verticalTileMode: Stretch

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,7 @@
+source: [e-mail]
+border.left: 1
+border.right: 2 
+border.top: 2
+border.bottom: 0
+horizontalTileMode: Stretch
+verticalTileMode: Stretch

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,7 @@
+source: [e-mail]
+border.left: 1
+border.right: 2
+border.top: 2
+border.bottom: 0
+horizontalTileMode: Stretch
+verticalTileMode: Stretch

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,7 @@
+source: [e-mail]
+border.left: 1
+border.right: 9 
+border.top: 10
+border.bottom: 0
+horizontalTileMode: Stretch
+verticalTileMode: Stretch

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,7 @@
+source: [e-mail]
+border.left: 1
+border.right: 9 
+border.top: 10
+border.bottom: 0
+horizontalTileMode: Stretch
+verticalTileMode: Stretch

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,5 @@
+border.left: 44
+border.top: 54
+border.bottom: 44
+border.right: 52
+source: [e-mail]
\ No newline at end of file

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,5 @@
+border.left: 44
+border.top: 54
+border.bottom: 44
+border.right: 52
+source: [e-mail]
\ No newline at end of file

=== added file 'artwork/[e-mail]'
Binary files artwork/[e-mail]	1970-01-01 00:00:00 +0000 and artwork/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'artwork/[e-mail]'
--- artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ artwork/[e-mail]	2013-09-09 19:09:28 +0000
@@ -0,0 +1,5 @@
+border.left: 44
+border.top: 54
+border.bottom: 44
+border.right: 52
+source: [e-mail]
\ No newline at end of file

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

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

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

=== modified file 'auth.js'
--- auth.js	2013-03-19 03:40:58 +0000
+++ auth.js	2013-09-09 19:09:28 +0000
@@ -51,10 +51,6 @@
     })
 }
 
-function getFaceApiUrl() {
-    return "https://graph.facebook.com/";
-}
-
 // Reads the auth token and checks its validity with Facebook
 function validateToken() {
     var token=getAuthToken();
@@ -69,18 +65,24 @@
 
     var req=new XMLHttpRequest();
     req.onreadystatechange = function() {
-        if ( (req.readyState == req.DONE) && (req.status == 200) ) {
-            var result = JSON.parse(req.responseText);
-            if (result.error === null) {
-                console.log("validateToken:invalid token");
+        if (req.readyState == req.DONE) {
+            try {
+                var result = JSON.parse(req.responseText);
+                if (result.error) {
+                    console.log("validateToken:"+result.error.message);
+                    invalidAuth();
+                } else {
+                    console.log("validateToken:valid token");
+                    validAuth(token, getAccountId());
+                }
+            } catch (e) {
+                console.log("validateToken:"+e);
                 invalidAuth();
-            } else {
-                console.log("validateToken:valid token");
-                validAuth(token, getAccountId());
             }
         }
     }
-    req.open("GET", getFaceApiUrl()+"me?access_token="+token, true);
+
+    req.open("GET", FacebookFuncs.getFaceApiUrl()+"me?access_token="+token, true);
     req.send();
 }
 
@@ -97,7 +99,10 @@
 }
 
 function getAuthToken() {
-    return getSetting("authtoken");
+    var authToken=getSetting("authtoken");
+
+    console.log("Facebook AuthToken:"+authToken)
+    return authToken;
 }
 
 function getAccountId() {

=== removed file '[e-mail]'
Binary files [e-mail]	2013-02-12 16:18:48 +0000 and [e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'debian/compat'
--- debian/compat	2013-02-12 16:18:48 +0000
+++ debian/compat	2013-09-09 19:09:28 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2013-04-04 20:12:47 +0000
+++ debian/control	2013-09-09 19:09:28 +0000
@@ -1,19 +1,20 @@
 Source: ubuntu-facebook-app
 Priority: extra
-Maintainer: Ugo Riboni <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0), 
-Standards-Version: 3.9.3
+Maintainer: Ubuntu App Cats <[e-mail]>
+Build-Depends: debhelper (>= 9), 
+Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-facebook-app
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-facebook-dev/ubuntu-facebook-app/trunk
 
 Package: ubuntu-facebook-app
 Section: misc
 Architecture: all
 Depends: ${misc:Depends},
          qmlscene,
-         qt-components-ubuntu,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-qtquick2-plugin,
-         qtdeclarative5-friends-plugin (>= 0.1.0bzr13.03.15)
+         qtdeclarative5-friends-plugin,
+         qtdeclarative5-accounts-plugin
 Description: Facebook application
  Core Facebook application
-

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-12 16:27:40 +0000
+++ debian/copyright	2013-09-09 19:09:28 +0000
@@ -1,16 +1,16 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ubuntu-facebook-app
 Source:
 
 Files: *
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0
+License: GPL-3
 
 Files: debian/*
 Copyright: 2013 Canonical Ltd.
-License: LGPL-3.0
+License: LGPL-3
 
-License: GPL-3.0
+License: GPL-3
  This package 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; either
@@ -27,7 +27,7 @@
  On Debian systems, the complete text of the GNU General
  Public License can be found in "/usr/share/common-licenses/GPL-3".
 
-License: LGPL-3.0
+License: LGPL-3
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either

=== removed file 'debian/docs'
=== modified file 'debian/rules'
--- debian/rules	2013-02-12 16:27:40 +0000
+++ debian/rules	2013-09-09 19:09:28 +0000
@@ -1,29 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Work-around for some machines where INSTALL_ROOT is not set properly by
-# dh_auto_install
-override_dh_auto_install:
-	dh_auto_install -- INSTALL_ROOT=$(CURDIR)/debian/tmp
-
-# Workaround a bug in that debhelper package version
-override_dh_install:
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin/
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/ubuntu-facebook-app/
-	cp ubuntu-facebook-app.desktop $(CURDIR)/debian/tmp/usr/share/applications/
-	cp ubuntu-facebook-app $(CURDIR)/debian/tmp/usr/bin/
-	cp -r *.qml *.png $(CURDIR)/debian/tmp/usr/share/ubuntu-facebook-app/
-	
-	dh_install --sourcedir=debian/tmp --fail-missing
-
 %:
 	dh $@
+
+override_dh_install:
+	dh_install --fail-missing

=== modified file 'debian/source/format'
--- debian/source/format	2013-02-12 16:18:48 +0000
+++ debian/source/format	2013-09-09 19:09:28 +0000
@@ -1,1 +1,1 @@
-3.0 (native)
+1.0

=== modified file 'debian/ubuntu-facebook-app.install'
--- debian/ubuntu-facebook-app.install	2013-02-12 16:27:40 +0000
+++ debian/ubuntu-facebook-app.install	2013-09-09 19:09:28 +0000
@@ -1,3 +1,4 @@
-usr/share/applications
-usr/bin
-usr/share/ubuntu-facebook-app
+ubuntu-facebook-app usr/bin/
+ubuntu-facebook-app.desktop usr/share/applications/
+*.qml usr/share/ubuntu-facebook-app/
+*.png usr/share/ubuntu-facebook-app/

=== added file 'facebook.js'
--- facebook.js	1970-01-01 00:00:00 +0000
+++ facebook.js	2013-09-09 19:09:28 +0000
@@ -0,0 +1,49 @@
+// Facebook Graph API Functions
+
+function getFaceApiUrl() {
+    return "https://graph.facebook.com/";
+}
+
+function Promise() {
+    var self=this;
+
+    this.done  = function(callback) {
+        self.doneCallback=callback;
+        return self;
+    };
+
+    this.fail = function(callback) {
+        self.failCallback=callback;
+        return self;
+    }
+}
+
+function getCommentCount(token, postId) {
+    var req=new XMLHttpRequest();
+    var promise = new Promise();
+
+    req.onreadystatechange = function() {
+        if (req.readyState == req.DONE) {
+            try {
+                var result = JSON.parse(req.responseText);
+                if (result.error) {
+                    if (promise.failCallback) promise.failCallback();
+                } else {
+                    if (promise.doneCallback && result.data.length>0) promise.doneCallback(result.data[0].comments.count);
+                }
+            } catch (e) {
+                if (promise.failCallback) promise.failCallback(e);
+            }
+        }
+    }
+
+    var requestUrl=getFaceApiUrl()+"fql?q=select+likes.count%2C+comments.count+FROM+stream+WHERE+post_id%3D'"+postId+"'&access_token="+token;
+    req.open("GET", requestUrl, true);
+    req.send();
+
+    return promise;
+}
+
+function getProfilePictureUrl(token) {
+    return getFaceApiUrl()+'/me/picture?access_token='+token;
+}

=== modified file 'facebook.qmlproject'
--- facebook.qmlproject	2013-03-16 13:43:11 +0000
+++ facebook.qmlproject	2013-09-09 19:09:28 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "facebook.qml"
+    mainFile: "ubuntu-facebook-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {

=== renamed file 'facebook.qmlproject.user' => 'facebook.qmlproject.user.THIS'
=== modified file 'facebook64.png'
Binary files facebook64.png	2013-02-12 16:27:40 +0000 and facebook64.png	2013-09-09 19:09:28 +0000 differ
=== added directory 'images'
=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'images/comment.png'
Binary files images/comment.png	1970-01-01 00:00:00 +0000 and images/comment.png	2013-09-09 19:09:28 +0000 differ
=== added file 'images/facebook.png'
Binary files images/facebook.png	1970-01-01 00:00:00 +0000 and images/facebook.png	2013-09-09 19:09:28 +0000 differ
=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'images/like.png'
Binary files images/like.png	1970-01-01 00:00:00 +0000 and images/like.png	2013-09-09 19:09:28 +0000 differ
=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== added file 'images/[e-mail]'
Binary files images/[e-mail]	1970-01-01 00:00:00 +0000 and images/[e-mail]	2013-09-09 19:09:28 +0000 differ
=== modified file 'ubuntu-facebook-app'
--- ubuntu-facebook-app	2013-03-18 01:28:18 +0000
+++ ubuntu-facebook-app	2013-09-09 19:09:28 +0000
@@ -1,2 +1,2 @@
 #!/bin/bash
-qmlscene /usr/share/ubuntu-facebook-app/facebook.qml
+qmlscene /usr/share/ubuntu-facebook-app/ubuntu-facebook-app.qml

=== modified file 'ubuntu-facebook-app.desktop'
--- ubuntu-facebook-app.desktop	2013-04-04 11:10:26 +0000
+++ ubuntu-facebook-app.desktop	2013-09-09 19:09:28 +0000
@@ -3,7 +3,7 @@
 Version=1.0
 Type=Application
 Terminal=false
-Exec=qmlscene /usr/share/ubuntu-facebook-app/facebook.qml
+Exec=qmlscene /usr/share/ubuntu-facebook-app/ubuntu-facebook-app.qml
 Icon=/usr/share/ubuntu-facebook-app/facebook64.png
 Name=Facebook
 X-Ubuntu-Touch=true

=== renamed file 'facebook.qml' => 'ubuntu-facebook-app.qml'
--- facebook.qml	2013-03-30 01:52:44 +0000
+++ ubuntu-facebook-app.qml	2013-09-09 19:09:28 +0000
@@ -9,10 +9,15 @@
     // objectName for functional testing purposes (autopilot-qt5)
     id: facebookMainView
     objectName: "facebook"
+    applicationName: "ubuntu-facebook-app"
     width: units.gu(50)
     height: units.gu(75)
     state: "loading"
 
+
+    property int accountId: -1
+    property string token
+
     signal refresh()
     signal invalidAuth()
 
@@ -22,15 +27,20 @@
         onAuthenticated: authModel.saveAccountInfo(token, accountId);
     }
 
+    StatusUpdatePopup {
+        id: statusPopup
+    }
+
     Tabs {
         id: tabNav
         height: 0
         width: 0
+        visible: false
 
         // News tab
         Tab {
             id: newsTab
-            title: i18n.tr("Facebook News")
+            title: i18n.tr("News")
             page: NewsPage {
                 id: newsPage
                 anchors.margins: units.gu(2)
@@ -41,7 +51,7 @@
         // Events tab
         Tab {
             id: eventsTab
-            title: i18n.tr("Facebook Events")
+            title: i18n.tr("Events")
             page: EventsPage {
                 id: eventsPage
                 anchors.margins: units.gu(2)
@@ -52,7 +62,7 @@
         // Wall tab
         Tab {
             id: wallTab
-            title: i18n.tr("Facebook Wall")
+            title: i18n.tr("Wall")
             page: WallPage {
                 id: wallPage
                 anchors.margins: units.gu(2)
@@ -63,21 +73,30 @@
 
     ToolbarActions {
         id: mainActions
+        lock: true
+        active: tabNav.visible
+
+        Action {
+            id: statusUpdateAction
+            iconSource: Qt.resolvedUrl("images/new.png")
+            text: i18n.tr("Status")
+            onTriggered: {
+                updateStatus();
+            }
+        }
         Action {
             id: refreshAccountAction
-            iconSource: Qt.resolvedUrl("refresh.png")
+            iconSource: Qt.resolvedUrl("images/reload.png")
             text: i18n.tr("Refresh")
             onTriggered: {
-                mainActions.active = false;
                 facebookMainView.refresh();
             }
         }
         Action {
             id: resetAccountAction
-            iconSource: Qt.resolvedUrl("avatar.png")
+            iconSource: Qt.resolvedUrl("images/avatar.png")
             text: i18n.tr("Logout")
             onTriggered: {
-                mainActions.active = false;
                 authModel.resetAccountInfo();
             }
         }
@@ -95,6 +114,10 @@
                 target: loadingPane
                 visible: true
             }
+            PropertyChanges {
+                target: tabNav
+                visible: false
+            }
         },
 
         State {
@@ -103,6 +126,10 @@
                 target: loadingPane
                 visible: false
             }
+            PropertyChanges {
+                target: tabNav
+                visible: true
+            }
         },
 
         State {
@@ -111,6 +138,10 @@
                 target: loadingPane
                 visible: false
             }
+            PropertyChanges {
+                target: tabNav
+                visible: false
+            }
         }
     ]
 
@@ -124,8 +155,9 @@
         }
 
         onValidAuth: {
-            console.log("Facebook::accountId::"+accountId);
-            newsPage.accountId = accountId
+            console.log("Facebook::accountId:"+accountId);
+            facebookMainView.accountId = accountId;
+            facebookMainView.token = token;
             facebookMainView.state = "validauth"
         }
     }
@@ -142,7 +174,13 @@
         }
     }
 
+
     Component.onCompleted: {
         initTimer.start();
     }
+
+    function updateStatus() {
+        statusPopup.open();
+    }
+
 }